[ARVADOS] updated: e7792c1d6dbfc6dda7da891ad7bab5152ed5b439

[git at public.curoverse.com]

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

       via  e7792c1d6dbfc6dda7da891ad7bab5152ed5b439 (commit)
      from  07beca79dfa589fe35dad751f6a25a6ce43cefe4 (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 e7792c1d6dbfc6dda7da891ad7bab5152ed5b439
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.

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


hooks/post-receive
--