From: radhika <radhika@curoverse.com>
Date: Mon, 9 Nov 2015 15:43:13 +0000 (-0500)
Subject: Merge branch 'master' into 7661-fuse-by-pdh
X-Git-Tag: 1.1.0~1260^2~6
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9bc0194676e3f22b41976fefc6146d7dd965d173

Merge branch 'master' into 7661-fuse-by-pdh
---

9bc0194676e3f22b41976fefc6146d7dd965d173
diff --cc sdk/cli/bin/crunch-job
index a8de76bec2,c2ea186ef5..e2a4e264c3
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@@ -893,12 -893,13 +893,13 @@@ for (my $todo_ptr = 0; $todo_ptr <= $#j
          .q{&& SWAP=$(awk '($1 == "SwapTotal:"){print $2}' </proc/meminfo) }
          ."&& MEMLIMIT=\$(( (\$MEM * 95) / ($ENV{CRUNCH_NODE_SLOTS} * 100) )) "
          ."&& let SWAPLIMIT=\$MEMLIMIT+\$SWAP ";
 -    $command .= "&& exec arv-mount --by-id --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
 +    $command .= "&& exec arv-mount --by-pdh --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 --rm=true --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.