arvados-cli 0.1.20150128223752 → 0.1.20150205181653

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 +9 -7
  3. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 566fd38f7693b25fbcc883017c6ef4779270218d
4
- data.tar.gz: 2ea24ca2b4616374e26e9da4f56f7803b229aa61
3
+ metadata.gz: 5db96a060492f026b5db1ffa822ff05f4fa98226
4
+ data.tar.gz: c27efe20246f3b4dae343bbc1d4181779bec024e
5
5
  SHA512:
6
- metadata.gz: 4e2c53d631fa9b4dd2da8dd544f7f840cd659ed0266457ca5bbc9d82e269309d19fb03520ddcfa9b374ca401633b7b00ba72116bc4405b7254f58631f5d1f9f9
7
- data.tar.gz: 84cf369e71c2c327b62f12bd7513e7b34b60623fb656ca20f58a8a779aaa7df5fe2944f354ef438d6e750baee22cb0f03c7529f07cecdddf94d3c690e02d80c7
6
+ metadata.gz: 0b54438c836bf61639440d8600863079dc19f3b2c33b76c3fb82f9cb175976042be3493647859d75ca4e3a1b5f765a6272b891a716a9b0dad77666972db8735a
7
+ data.tar.gz: 5aea6d033f7dd3c7ba628fc6a31fa68d838fa590ced005ec3f363cacbff7b60437f86e23a245bc7f6351555e74439170738a1bc71dfc859be85f32746aa8ca7f
data/bin/crunch-job CHANGED
@@ -1274,10 +1274,10 @@ sub fetch_block
1274
1274
  return $output_block;
1275
1275
  }
1276
1276
 
1277
- # create_output_collections generates a new collection containing the
1278
- # output of each successfully completed task, and returns the
1279
- # portable_data_hash for the new collection.
1280
- #
1277
+ # Create a collection by concatenating the output of all tasks (each
1278
+ # task's output is either a manifest fragment, a locator for a
1279
+ # manifest fragment stored in Keep, or nothing at all). Return the
1280
+ # portable_data_hash of the new collection.
1281
1281
  sub create_output_collection
1282
1282
  {
1283
1283
  Log (undef, "collate");
@@ -1292,10 +1292,11 @@ sub create_output_collection
1292
1292
  '.execute()["portable_data_hash"]'
1293
1293
  );
1294
1294
 
1295
+ my $task_idx = -1;
1295
1296
  for (@jobstep)
1296
1297
  {
1297
- next if (!exists $_->{'arvados_task'}->{'output'} ||
1298
- !$_->{'arvados_task'}->{'success'});
1298
+ ++$task_idx;
1299
+ next unless exists $_->{'arvados_task'}->{'output'};
1299
1300
  my $output = $_->{'arvados_task'}->{output};
1300
1301
  if ($output !~ /^[0-9a-f]{32}(\+\S+)*$/)
1301
1302
  {
@@ -1307,7 +1308,8 @@ sub create_output_collection
1307
1308
  }
1308
1309
  else
1309
1310
  {
1310
- Log (undef, "XXX fetch_block($output) failed XXX");
1311
+ my $uuid = $_->{'arvados_task'}->{'uuid'};
1312
+ Log (undef, "Error retrieving '$output' output by task $task_idx ($uuid)");
1311
1313
  $main::success = 0;
1312
1314
  }
1313
1315
  }
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.20150128223752
4
+ version: 0.1.20150205181653
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-01-28 00:00:00.000000000 Z
11
+ date: 2015-02-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 0fb26747fa229d6b19ec911b907259a8e84acd83
181
+ description: Arvados command line tools, git commit 1e2e0e4f14a730ba1bbea6a4ced5d87ea2766c35
182
182
  email: gem-dev@curoverse.com
183
183
  executables:
184
184
  - arv