arvados-cli 1.1.4.20180717191923 → 1.1.4.20180723133344
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/crunch-job +10 -0
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 23c7e70c593a52adefc631ab33756b63c3b91bf1
|
|
4
|
+
data.tar.gz: 5dcaf8ec739c4bb68bed56df8bd77849d3ac4288
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: eabcc3085448eced07a52746370ce666b9ea0d893d5815c3c24cc3e9cd0e1d6399cbc6c3e59a50edc887417ade65ef34c82c8a91a5b3f0a4ac26419130440c7b
|
|
7
|
+
data.tar.gz: '0038c467594cace21dbd16cc74fde59a1994a75a1f04fe95ac7f08c519a1e68479c0ddc6728c4e383b9711697b390a15cc1510474b89339e837bce6544765559'
|
data/bin/crunch-job
CHANGED
|
@@ -132,6 +132,7 @@ my $resume_stash;
|
|
|
132
132
|
my $cgroup_root = "/sys/fs/cgroup";
|
|
133
133
|
my $docker_bin = "docker.io";
|
|
134
134
|
my $docker_run_args = "";
|
|
135
|
+
my $srun_sync_timeout = 15*60;
|
|
135
136
|
GetOptions('force-unlock' => \$force_unlock,
|
|
136
137
|
'git-dir=s' => \$git_dir,
|
|
137
138
|
'job=s' => \$jobspec,
|
|
@@ -141,6 +142,7 @@ GetOptions('force-unlock' => \$force_unlock,
|
|
|
141
142
|
'cgroup-root=s' => \$cgroup_root,
|
|
142
143
|
'docker-bin=s' => \$docker_bin,
|
|
143
144
|
'docker-run-args=s' => \$docker_run_args,
|
|
145
|
+
'srun-sync-timeout=i' => \$srun_sync_timeout,
|
|
144
146
|
);
|
|
145
147
|
|
|
146
148
|
if (defined $job_api_token) {
|
|
@@ -2007,6 +2009,8 @@ sub srun_sync
|
|
|
2007
2009
|
my ($stdout_r, $stdout_w);
|
|
2008
2010
|
pipe $stdout_r, $stdout_w or croak("pipe() failed: $!");
|
|
2009
2011
|
|
|
2012
|
+
my $started_srun = scalar time;
|
|
2013
|
+
|
|
2010
2014
|
my $srunpid = fork();
|
|
2011
2015
|
if ($srunpid == 0)
|
|
2012
2016
|
{
|
|
@@ -2050,6 +2054,12 @@ sub srun_sync
|
|
|
2050
2054
|
if (!$busy) {
|
|
2051
2055
|
select(undef, undef, undef, 0.1);
|
|
2052
2056
|
}
|
|
2057
|
+
if (($started_srun + $srun_sync_timeout) < scalar time) {
|
|
2058
|
+
# Exceeded general timeout for "srun_sync" operations, likely
|
|
2059
|
+
# means something got stuck on the remote node.
|
|
2060
|
+
Log(undef, "srun_sync exceeded timeout, will fail.");
|
|
2061
|
+
$main::please_freeze = 1;
|
|
2062
|
+
}
|
|
2053
2063
|
killem(keys %proc) if $main::please_freeze;
|
|
2054
2064
|
}
|
|
2055
2065
|
my $exited = $?;
|
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: 1.1.4.
|
|
4
|
+
version: 1.1.4.20180723133344
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Arvados Authors
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-07-
|
|
11
|
+
date: 2018-07-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: arvados
|
|
@@ -158,7 +158,7 @@ dependencies:
|
|
|
158
158
|
- - "~>"
|
|
159
159
|
- !ruby/object:Gem::Version
|
|
160
160
|
version: '0.8'
|
|
161
|
-
description: Arvados command line tools, git commit
|
|
161
|
+
description: Arvados command line tools, git commit cec8e2705d260c9df1042858941419a3b9160c0e
|
|
162
162
|
email: gem-dev@curoverse.com
|
|
163
163
|
executables:
|
|
164
164
|
- arv
|