arvados-cli 0.1.20150603135055 → 0.1.20150605170031

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b2fd398e685fe06211ac7885274e8e8de2d99f4
-  data.tar.gz: 5b5b5b764f9a1853443fde6dc8957f94dfe4ebad
+  metadata.gz: 285db94e1d07f81d34fc16dd2afdb4861d7682af
+  data.tar.gz: 1439d215e2d56c75c36f9103ce802b292857684d
 SHA512:
-  metadata.gz: 9accb2d87fe4993a89c4cd9ddb4790a605d165185fd17d908ad9e2b3bf6e45fafddb5432d6caa9e7dcf45aeff832683e3ed79dfd0e2b09805624b1e13688a301
-  data.tar.gz: 5c194163fa247bdee9531d7403db995af6d21aba1d1b73961e29204da3c89a5f9574e1a229feee1ce0cef8f97e24140ccff87654f5d0664b3cbe514d118dd435
+  metadata.gz: eabe822a504b02a89cd160c34980464b1ad6d861f0c402e32be7aae47722d6b378012b8cbeb74156d8bd9a6f4b303d026077de19c82d2ae32dfd8d028c9a3eb4
+  data.tar.gz: e4bdb2371ce1d2ab577db7d17510e66f714d876b87f9c7d27c667b1926404d89ab7761a949d3be11231eb03052441847b813955fb66509dfec577c4148d5e172

data/bin/crunch-job

@@ -1299,8 +1299,15 @@ sub check_squeue
     return;
   }
 
-  # get a list of steps still running
-  my @squeue = `squeue --jobs=\Q$ENV{SLURM_JOB_ID}\E --steps --format='%i %j' --noheader`;
+  # Get a list of steps still running.  Note: squeue(1) says --steps
+  # selects a format (which we override anyway) and allows us to
+  # specify which steps we're interested in (which we don't).
+  # Importantly, it also changes the meaning of %j from "job name" to
+  # "step name" and (although this isn't mentioned explicitly in the
+  # docs) switches from "one line per job" mode to "one line per step"
+  # mode. Without it, we'd just get a list of one job, instead of a
+  # list of N steps.
+  my @squeue = `squeue --jobs=\Q$ENV{SLURM_JOB_ID}\E --steps --format='%j' --noheader`;
   if ($? != 0)
   {
     Log(undef, "warning: squeue exit status $? ($!)");
@@ -1310,15 +1317,9 @@ sub check_squeue
 
   # which of my jobsteps are running, according to squeue?
   my %ok;
-  foreach (@squeue)
+  for my $jobstepname (@squeue)
   {
-    if (/^(\d+)\.(\d+) (\S+)/)
-    {
-      if ($1 eq $ENV{SLURM_JOB_ID})
-      {
-	$ok{$3} = 1;
-      }
-    }
+    $ok{$jobstepname} = 1;
   }
 
   # Check for child procs >60s old and not mentioned by squeue.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20150603135055
+  version: 0.1.20150605170031
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -178,7 +178,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: Arvados command line tools, git commit c4c8977ef25cc6805f2cca1dedfc83faecc0bc23
+description: Arvados command line tools, git commit b33597e94eec5f21fbbcfa72611a3b36397755d5
 email: gem-dev@curoverse.com
 executables:
 - arv