[ARVADOS] updated: 8094a4b4914d892461b2a6fbcbeb10b938a6733b

[Git user]

Summary of changes:
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 27 ++++++++++-------
 .../crunch-dispatch-slurm_test.go                  |  5 ++--
 services/crunch-dispatch-slurm/script.go           | 15 ++++++++++
 services/crunch-dispatch-slurm/script_test.go      | 24 +++++++++++++++
 services/crunch-run/cgroup.go                      | 29 ++++++++++++++++++
 services/crunch-run/cgroup_test.go                 | 17 +++++++++++
 services/crunch-run/crunchrun.go                   | 35 ++++++++++++++++++----
 7 files changed, 132 insertions(+), 20 deletions(-)
 create mode 100644 services/crunch-dispatch-slurm/script.go
 create mode 100644 services/crunch-dispatch-slurm/script_test.go
 create mode 100644 services/crunch-run/cgroup.go
 create mode 100644 services/crunch-run/cgroup_test.go

       via  8094a4b4914d892461b2a6fbcbeb10b938a6733b (commit)
       via  e2fc01e97c473de174c39c328dc3116ecc699225 (commit)
       via  5df1299bef79cbae96aecfd710a8d2cc088e4ecd (commit)
       via  483ca35ac4348924cfbc187dab4f1b88a272eea7 (commit)
      from  47833e79d907d5a5c269f0a2924db535a9c42c05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8094a4b4914d892461b2a6fbcbeb10b938a6733b
Merge: 47833e7 e2fc01e
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 4 11:31:44 2016 -0400

    Merge branch '9406-cgroup-parent'
    
    closes #9406


commit e2fc01e97c473de174c39c328dc3116ecc699225
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 4 11:31:34 2016 -0400

    9406: Explain why there are two separate CgroupParent fields.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 40e9fc1..f99beff 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -93,12 +93,23 @@ type ContainerRunner struct {
 	ArvMountExit   chan error
 	finalState     string
 
-	statLogger         io.WriteCloser
-	statReporter       *crunchstat.Reporter
-	statInterval       time.Duration
-	cgroupRoot         string
+	statLogger   io.WriteCloser
+	statReporter *crunchstat.Reporter
+	statInterval time.Duration
+	cgroupRoot   string
+	// What we expect the container's cgroup parent to be.
 	expectCgroupParent string
-	setCgroupParent    string
+	// What we tell docker to use as the container's cgroup
+	// parent. Note: Ideally we would use the same field for both
+	// expectCgroupParent and setCgroupParent, and just make it
+	// default to "docker". However, when using docker < 1.10 with
+	// systemd, specifying a non-empty cgroup parent (even the
+	// default value "docker") hits a docker bug
+	// (https://github.com/docker/docker/issues/17126). Using two
+	// separate fields makes it possible to use the "expect cgroup
+	// parent to be X" feature even on sites where the "specify
+	// cgroup parent" feature breaks.
+	setCgroupParent string
 }
 
 // SetupSignals sets up signal handling to gracefully terminate the underlying

-----------------------------------------------------------------------


hooks/post-receive
--