arvados-cli 0.1.20140616132754 → 0.1.20140616152753

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e4f19adbce0bf5fc0ba532f0e132c39da05e06b
-  data.tar.gz: 2193d4e95bf34cfd7a6820a9b8bfa7f7cdd6e892
+  metadata.gz: c2ea85d71466309df46d656ca0a395e638fd1716
+  data.tar.gz: 3246cf8fd176c5061e8e1df59458d787065aa845
 SHA512:
-  metadata.gz: 06d2abed95b2c83850ba20655d8a30af34e7229b8dc86afd99570a53eab439acab780415a9f4e4fb381b87f22aa8339e971d4a2973f57369fda4bafe33c9dae8
-  data.tar.gz: 324fae742a66aa974cb80b5c5a952a2390decb30ca5c4b8f66dbbf08dbc40dddaaf4d3fafbb54acdf2dda732f98bbeddb49803b4bb2e351dad392e9dcd7612d7
+  metadata.gz: a843a87259742e70da986e24362eff16c2a21a6fe3348f527c0316d6c84288ab8f945831f72f7b7ec60cbf579e58729655be56312f205a334d196a20374c7346
+  data.tar.gz: 00d747bcd22b0632aa128d35917c60e2c9bd8d83cee5e568376f6827fc1c19b15e936267cdf59f6d090836f3ec690aa259d65316b59ac99dadadacef5dd05c5e

data/bin/crunch-job

@@ -501,13 +501,23 @@ if (!$have_slurm)
 
 # If this job requires a Docker image, install that.
 my $docker_bin = "/usr/bin/docker.io";
-my $docker_image = $Job->{runtime_constraints}->{docker_image} || "";
-if ($docker_image) {
+my ($docker_locator, $docker_hash);
+if ($docker_locator = $Job->{docker_image_locator}) {
+  $docker_hash = find_docker_hash($docker_locator);
+  if (!$docker_hash)
+  {
+    croak("No Docker image hash found from locator $docker_locator");
+  }
+  my $docker_install_script = qq{
+if ! $docker_bin images -q --no-trunc | grep -qxF \Q$docker_hash\E; then
+    arv-get \Q$docker_locator/$docker_hash.tar\E | $docker_bin load
+fi
+};
   my $docker_pid = fork();
   if ($docker_pid == 0)
   {
-    srun (["srun", "--nodelist=" . join(' ', @node)],
-          [$docker_bin, 'pull', $docker_image]);
+    srun (["srun", "--nodelist=" . join(',', @node)],
+          ["/bin/sh", "-ec", $docker_install_script]);
     exit ($?);
   }
   while (1)
@@ -516,11 +526,9 @@ if ($docker_image) {
     freeze_if_want_freeze ($docker_pid);
     select (undef, undef, undef, 0.1);
   }
-  # If the Docker image was specified as a hash, pull will fail.
-  # Ignore that error.  We'll see what happens when we try to run later.
-  if (($? != 0) && ($docker_image !~ /^[0-9a-fA-F]{5,64}$/))
+  if ($? != 0)
   {
-    croak("Installing Docker image $docker_image returned exit code $?");
+    croak("Installing Docker image from $docker_locator returned exit code $?");
   }
 }
 
@@ -639,7 +647,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
 	  "&& perl -";
     }
     $command .= "&& exec arv-mount --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
-    if ($docker_image)
+    if ($docker_hash)
     {
       $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -cgroup-parent=docker -cgroup-cid=$ENV{TASK_WORK}/docker.cid -poll=10000 ";
       $command .= "$docker_bin run -i -a stdin -a stdout -a stderr --cidfile=$ENV{TASK_WORK}/docker.cid ";
@@ -659,7 +667,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
           $command .= "-e \Q$env_key=$env_val\E ";
         }
       }
-      $command .= "\Q$docker_image\E ";
+      $command .= "\Q$docker_hash\E ";
     } else {
       $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -poll=10000 "
     }
@@ -1437,6 +1445,21 @@ sub must_lock_now
   }
 }
 
+sub find_docker_hash {
+  # Given a Keep locator, search for a matching link to find the Docker hash
+  # of the stored image.
+  my $locator = shift;
+  my $links_result = $arv->{links}->{list}->execute(
+    filters => [["head_uuid", "=", $locator],
+                ["link_class", "=", "docker_image_hash"]],
+    limit => 1);
+  my $docker_hash;
+  foreach my $link (@{$links_result->{items}}) {
+    $docker_hash = lc($link->{name});
+  }
+  return $docker_hash;
+}
+
 __DATA__
 #!/usr/bin/perl
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140616132754
+  version: 0.1.20140616152753
 platform: ruby
 authors:
 - Arvados Authors
@@ -146,7 +146,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: This is the Arvados SDK CLI gem, git revision 95811b3a901df3ceab701fe18e9ec1bb614bef90
+description: This is the Arvados SDK CLI gem, git revision 439e1417599cad4e65d506a11b583a6ebabc7604
 email: gem-dev@curoverse.com
 executables:
 - arv