[ARVADOS] updated: 301d6e0468f5dcda1443f6a38a51540e998e2079

[Git user]

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

       via  301d6e0468f5dcda1443f6a38a51540e998e2079 (commit)
      from  2324d45d702c454057558919be2f598f416e9f91 (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 301d6e0468f5dcda1443f6a38a51540e998e2079
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Mar 14 21:05:17 2016 -0400

    8203/8690: crunch-job uses `srun --nodes=1`.
    
    Using `srun --nodelist=[one node]` is not sufficient to ensure that
    the command runs on a single node; only that it will at least be
    allocated the requested node.  This is documented in the srun man
    page, and we've observed additional node allocations in these calls.
    When srun allocates additional nodes to the work, this can break later
    parsing code in crunch-job.
    
    Prefer --nodes, which sets a hard maximum on the number of nodes used.
    We're already using this to run individual tasks (-N1), so it's a
    known strategy.  Tested live before pushing.  Refs #8203, #8690.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index e473710..7c2855c 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -432,7 +432,7 @@ fi
 
   # Determine whether this version of Docker supports memory+swap limits.
   ($exited, $stdout, $stderr) = srun_sync(
-    ["srun", "--nodelist=" . $node[0]],
+    ["srun", "--nodes=1"],
     [$docker_bin, 'run', '--help'],
     {label => "check --memory-swap feature"});
   $docker_limitmem = ($stdout =~ /--memory-swap/);
@@ -455,7 +455,7 @@ fi
       $try_user_arg = "--user=$try_user";
     }
     my ($exited, $stdout, $stderr) = srun_sync(
-      ["srun", "--nodelist=" . $node[0]],
+      ["srun", "--nodes=1"],
       ["/bin/sh", "-ec",
        "$docker_bin run $docker_run_args $try_user_arg $docker_hash id --user"],
       {label => $label});

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


hooks/post-receive
--