arvados-cli 0.1.20150603135055 → 0.1.20150605170031

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/bin/crunch-job +11 -10
  3. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6b2fd398e685fe06211ac7885274e8e8de2d99f4
4
- data.tar.gz: 5b5b5b764f9a1853443fde6dc8957f94dfe4ebad
3
+ metadata.gz: 285db94e1d07f81d34fc16dd2afdb4861d7682af
4
+ data.tar.gz: 1439d215e2d56c75c36f9103ce802b292857684d
5
5
  SHA512:
6
- metadata.gz: 9accb2d87fe4993a89c4cd9ddb4790a605d165185fd17d908ad9e2b3bf6e45fafddb5432d6caa9e7dcf45aeff832683e3ed79dfd0e2b09805624b1e13688a301
7
- data.tar.gz: 5c194163fa247bdee9531d7403db995af6d21aba1d1b73961e29204da3c89a5f9574e1a229feee1ce0cef8f97e24140ccff87654f5d0664b3cbe514d118dd435
6
+ metadata.gz: eabe822a504b02a89cd160c34980464b1ad6d861f0c402e32be7aae47722d6b378012b8cbeb74156d8bd9a6f4b303d026077de19c82d2ae32dfd8d028c9a3eb4
7
+ data.tar.gz: e4bdb2371ce1d2ab577db7d17510e66f714d876b87f9c7d27c667b1926404d89ab7761a949d3be11231eb03052441847b813955fb66509dfec577c4148d5e172
data/bin/crunch-job CHANGED
@@ -1299,8 +1299,15 @@ sub check_squeue
1299
1299
  return;
1300
1300
  }
1301
1301
 
1302
- # get a list of steps still running
1303
- my @squeue = `squeue --jobs=\Q$ENV{SLURM_JOB_ID}\E --steps --format='%i %j' --noheader`;
1302
+ # Get a list of steps still running. Note: squeue(1) says --steps
1303
+ # selects a format (which we override anyway) and allows us to
1304
+ # specify which steps we're interested in (which we don't).
1305
+ # Importantly, it also changes the meaning of %j from "job name" to
1306
+ # "step name" and (although this isn't mentioned explicitly in the
1307
+ # docs) switches from "one line per job" mode to "one line per step"
1308
+ # mode. Without it, we'd just get a list of one job, instead of a
1309
+ # list of N steps.
1310
+ my @squeue = `squeue --jobs=\Q$ENV{SLURM_JOB_ID}\E --steps --format='%j' --noheader`;
1304
1311
  if ($? != 0)
1305
1312
  {
1306
1313
  Log(undef, "warning: squeue exit status $? ($!)");
@@ -1310,15 +1317,9 @@ sub check_squeue
1310
1317
 
1311
1318
  # which of my jobsteps are running, according to squeue?
1312
1319
  my %ok;
1313
- foreach (@squeue)
1320
+ for my $jobstepname (@squeue)
1314
1321
  {
1315
- if (/^(\d+)\.(\d+) (\S+)/)
1316
- {
1317
- if ($1 eq $ENV{SLURM_JOB_ID})
1318
- {
1319
- $ok{$3} = 1;
1320
- }
1321
- }
1322
+ $ok{$jobstepname} = 1;
1322
1323
  }
1323
1324
 
1324
1325
  # Check for child procs >60s old and not mentioned by squeue.
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arvados-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.20150603135055
4
+ version: 0.1.20150605170031
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arvados Authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-03 00:00:00.000000000 Z
11
+ date: 2015-06-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: arvados
@@ -178,7 +178,7 @@ dependencies:
178
178
  - - "<"
179
179
  - !ruby/object:Gem::Version
180
180
  version: 1.0.0
181
- description: Arvados command line tools, git commit c4c8977ef25cc6805f2cca1dedfc83faecc0bc23
181
+ description: Arvados command line tools, git commit b33597e94eec5f21fbbcfa72611a3b36397755d5
182
182
  email: gem-dev@curoverse.com
183
183
  executables:
184
184
  - arv