[ARVADOS] updated: 82b7adbaf524d6e7fd2b9a6403f9e490dcb3ac85

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

       via  82b7adbaf524d6e7fd2b9a6403f9e490dcb3ac85 (commit)
       via  bd9722cb7b6f92b752ac786797d884ea711944cb (commit)
      from  7bde93de3260e08503c7bf9c06fd3448972d378a (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 82b7adbaf524d6e7fd2b9a6403f9e490dcb3ac85
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Nov 2 10:26:39 2015 -0500

    7444: Set docker container name to {taskUUID}-{attemptNum}.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 780a73b..c2ea186 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -896,9 +896,10 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     $command .= "&& exec arv-mount --by-id --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
     if ($docker_hash)
     {
-      my $cidfile = "$ENV{CRUNCH_TMP}/$Jobstep->{arvados_task}->{uuid}-$Jobstep->{failures}.cid";
+      my $containername = "$Jobstep->{arvados_task}->{uuid}-$Jobstep->{failures}";
+      my $cidfile = "$ENV{CRUNCH_TMP}/$containername.cid";
       $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -cgroup-parent=docker -cgroup-cid=$cidfile -poll=10000 ";
-      $command .= "$docker_bin run --attach=stdout --attach=stderr --attach=stdin -i \Q$dockeruserarg\E --cidfile=$cidfile --sig-proxy ";
+      $command .= "$docker_bin run --name=$containername --attach=stdout --attach=stderr --attach=stdin -i \Q$dockeruserarg\E --cidfile=$cidfile --sig-proxy ";
       # We only set memory limits if Docker lets us limit both memory and swap.
       # Memory limits alone have been supported longer, but subprocesses tend
       # to get SIGKILL if they exceed that without any swap limit set.

commit bd9722cb7b6f92b752ac786797d884ea711944cb
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Oct 30 18:28:46 2015 -0400

    7444: Do not remove docker containers with docker --rm; let dockercleaner do it.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 555c4d1..780a73b 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -467,7 +467,7 @@ fi
     }
     srun(["srun", "--nodelist=" . $node[0]],
          ["/bin/sh", "-ec",
-          "a=`$docker_bin run --rm $try_user_arg $docker_hash id --user` && " .
+          "a=`$docker_bin run $try_user_arg $docker_hash id --user` && " .
           " test \$a -ne 0"],
          {fork => 1});
     if ($? == 0) {
@@ -898,7 +898,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     {
       my $cidfile = "$ENV{CRUNCH_TMP}/$Jobstep->{arvados_task}->{uuid}-$Jobstep->{failures}.cid";
       $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -cgroup-parent=docker -cgroup-cid=$cidfile -poll=10000 ";
-      $command .= "$docker_bin run --rm=true --attach=stdout --attach=stderr --attach=stdin -i \Q$dockeruserarg\E --cidfile=$cidfile --sig-proxy ";
+      $command .= "$docker_bin run --attach=stdout --attach=stderr --attach=stdin -i \Q$dockeruserarg\E --cidfile=$cidfile --sig-proxy ";
       # We only set memory limits if Docker lets us limit both memory and swap.
       # Memory limits alone have been supported longer, but subprocesses tend
       # to get SIGKILL if they exceed that without any swap limit set.

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


hooks/post-receive
--