arvados-cli 1.1.4.20180717191923 → 1.1.4.20180723133344

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 267a83dd76d42b257418e054ec0b2a51c8d3cbdd
-  data.tar.gz: 413e9aa21748a3a1f0b53685595edd8bc21c0c31
+  metadata.gz: 23c7e70c593a52adefc631ab33756b63c3b91bf1
+  data.tar.gz: 5dcaf8ec739c4bb68bed56df8bd77849d3ac4288
 SHA512:
-  metadata.gz: c6edd2d6f04ebf0fdbed905d56c2afdb6c9ade1cb540b463141704061565b771da518040acf451349854a381a0741f6d4d4cdb6fccef8567fc61a9786fba4bf0
-  data.tar.gz: 37891ea3b000ddea9baf1bdbee1abcc61a814b8308437356eab3d1b189d2f809e2ea1bb8447aa2619af14c1a083e8751bf61b0f31cf38cbe62738f35dbf59b24
+  metadata.gz: eabcc3085448eced07a52746370ce666b9ea0d893d5815c3c24cc3e9cd0e1d6399cbc6c3e59a50edc887417ade65ef34c82c8a91a5b3f0a4ac26419130440c7b
+  data.tar.gz: '0038c467594cace21dbd16cc74fde59a1994a75a1f04fe95ac7f08c519a1e68479c0ddc6728c4e383b9711697b390a15cc1510474b89339e837bce6544765559'

data/bin/crunch-job

@@ -132,6 +132,7 @@ my $resume_stash;
 my $cgroup_root = "/sys/fs/cgroup";
 my $docker_bin = "docker.io";
 my $docker_run_args = "";
+my $srun_sync_timeout = 15*60;
 GetOptions('force-unlock' => \$force_unlock,
            'git-dir=s' => \$git_dir,
            'job=s' => \$jobspec,
@@ -141,6 +142,7 @@ GetOptions('force-unlock' => \$force_unlock,
            'cgroup-root=s' => \$cgroup_root,
            'docker-bin=s' => \$docker_bin,
            'docker-run-args=s' => \$docker_run_args,
+           'srun-sync-timeout=i' => \$srun_sync_timeout,
     );
 
 if (defined $job_api_token) {
@@ -2007,6 +2009,8 @@ sub srun_sync
   my ($stdout_r, $stdout_w);
   pipe $stdout_r, $stdout_w or croak("pipe() failed: $!");
 
+  my $started_srun = scalar time;
+
   my $srunpid = fork();
   if ($srunpid == 0)
   {
@@ -2050,6 +2054,12 @@ sub srun_sync
     if (!$busy) {
       select(undef, undef, undef, 0.1);
     }
+    if (($started_srun + $srun_sync_timeout) < scalar time) {
+      # Exceeded general timeout for "srun_sync" operations, likely
+      # means something got stuck on the remote node.
+      Log(undef, "srun_sync exceeded timeout, will fail.");
+      $main::please_freeze = 1;
+    }
     killem(keys %proc) if $main::please_freeze;
   }
   my $exited = $?;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.4.20180717191923
+  version: 1.1.4.20180723133344
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -158,7 +158,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Arvados command line tools, git commit 55137e6828bf11f76c3f9ec61e4a76954f5d6fa1
+description: Arvados command line tools, git commit cec8e2705d260c9df1042858941419a3b9160c0e
 email: gem-dev@curoverse.com
 executables:
 - arv