arvados-cli 0.1.20150120194251 → 0.1.20150121183928

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a04342c6fc40b6c05addbc1c94164b264de9b41e
-  data.tar.gz: 742246a0aec057dcf3fc93ff329f4b205ef014bb
+  metadata.gz: 2943fea5fd2753f9336bb8c860c159f97d184718
+  data.tar.gz: 1887ce217972e9e91cdce8e0e44884b99fd50065
 SHA512:
-  metadata.gz: 71c5acbe9cc14e883930bc2c28235f6488a339b557679b2cd5e9272143b335115883a15d0e6e81c706c21cacc6a63295b6994a3fc3f258566ce2a17e54455961
-  data.tar.gz: 5e5306184e850748f8453180c884defbd2c2af408bc13722ce53b52f99ee3114a9ff50a5e3eb91088c4107a03391cf6df1e2c3e3b717399cbccbc8f6b4320e96
+  metadata.gz: a4e77cf418857b91a0548fd4a913ca9cac4f46c21e9f0ce5ced020ac546d046ca116d924d7234f20a21e8f5e832dea7dded6434b686994bebd10d1d0060903a5
+  data.tar.gz: d60b601e81956409d9a145d3904cec7bfd6b1cc2c9813a05b7502127476a2f5272e96ad2babcbb2eca8e8ec80c87e27589069876082e658fc2ebd5a5d8c2df59

data/bin/crunch-job

@@ -356,8 +356,12 @@ if (!defined $no_clear_tmp) {
   my $cleanpid = fork();
   if ($cleanpid == 0)
   {
+    # Find FUSE mounts that look like Keep mounts (the mount path has the
+    # word "keep") and unmount them.  Then clean up work directories.
+    # TODO: When #5036 is done and widely deployed, we can get rid of the
+    # regular expression and just unmount everything with type fuse.keep.
     srun (["srun", "--nodelist=$nodelist", "-D", $ENV{'TMPDIR'}],
-          ['bash', '-c', 'if mount | grep -q $JOB_WORK/; then for i in $JOB_WORK/*keep $CRUNCH_TMP/task/*.keep; do /bin/fusermount -z -u $i; done; fi; sleep 1; rm -rf $JOB_WORK $CRUNCH_INSTALL $CRUNCH_TMP/task $CRUNCH_TMP/src*']);
+          ['bash', '-ec', 'mount -t fuse,fuse.keep | awk \'($3 ~ /\ykeep\y/){print $3}\' | xargs -r -n 1 fusermount -u -z; sleep 1; rm -rf $JOB_WORK $CRUNCH_INSTALL $CRUNCH_TMP/task $CRUNCH_TMP/src*']);
     exit (1);
   }
   while (1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20150120194251
+  version: 0.1.20150121183928
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-21 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 279c6f8bc69a3edfcf7213e0c1b7621f60a46c06
+description: Arvados command line tools, git commit ef969ca8dabe571a9866a7b3b7c39098785022fa
 email: gem-dev@curoverse.com
 executables:
 - arv