[ARVADOS] updated: 8183ec3a98d132182e8a27fa90260a3d3301e029

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

       via  8183ec3a98d132182e8a27fa90260a3d3301e029 (commit)
      from  5df1299bef79cbae96aecfd710a8d2cc088e4ecd (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 8183ec3a98d132182e8a27fa90260a3d3301e029
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 4 10:55:06 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..38d7de5 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -97,7 +97,18 @@ type ContainerRunner struct {
 	statReporter       *crunchstat.Reporter
 	statInterval       time.Duration
 	cgroupRoot         string
+	// What we expect the container's cgroup parent to be.
 	expectCgroupParent 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
 }
 

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


hooks/post-receive
--