arvados-cli 0.1.20140811142057 → 0.1.20140811170646
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 +17 -6
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: febddc1e5b92663b5edf999c5bbb60e3201b4861
|
4
|
+
data.tar.gz: b46ee559a02d04b8fc01b745eb2aceb9fc0f174e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 20590e2b98f97db71a56bbfb56aee7c59c3646696777ae6f1a24349355b8406a84e11d52cd7d37dd6b8f600214ddcbb06e0de7bcc769d49728df90657f43df1c
|
7
|
+
data.tar.gz: 696b79fbf54da4265c372e2ef4de49614d3f235b505c02689b47b4740b42dd4176ca21b0b898ab4b39df66a5ea15044d88d8d5b63be1d1fd4a122dd146d571c9
|
data/bin/crunch-job
CHANGED
@@ -150,17 +150,25 @@ if ($job_has_uuid)
|
|
150
150
|
{
|
151
151
|
$Job = $arv->{'jobs'}->{'get'}->execute('uuid' => $jobspec);
|
152
152
|
if (!$force_unlock) {
|
153
|
+
# If some other crunch-job process has grabbed this job (or we see
|
154
|
+
# other evidence that the job is already underway) we exit 111 so
|
155
|
+
# crunch-dispatch (our parent process) doesn't mark the job as
|
156
|
+
# failed.
|
153
157
|
if ($Job->{'is_locked_by_uuid'}) {
|
154
|
-
|
158
|
+
Log(undef, "Job is locked by " . $Job->{'is_locked_by_uuid'} . ", exiting 111");
|
159
|
+
exit(111);
|
155
160
|
}
|
156
161
|
if ($Job->{'success'} ne undef) {
|
157
|
-
|
162
|
+
Log(undef, "Job 'success' flag (" . $Job->{'success'} . ") is not null");
|
163
|
+
exit(111);
|
158
164
|
}
|
159
165
|
if ($Job->{'running'}) {
|
160
|
-
|
166
|
+
Log(undef, "Job 'running' flag is already set");
|
167
|
+
exit(111);
|
161
168
|
}
|
162
169
|
if ($Job->{'started_at'}) {
|
163
|
-
|
170
|
+
Log(undef, "Job 'started_at' time is already set (" . $Job->{'started_at'} . ")");
|
171
|
+
exit(111);
|
164
172
|
}
|
165
173
|
}
|
166
174
|
}
|
@@ -273,7 +281,8 @@ if ($job_has_uuid)
|
|
273
281
|
# Claim this job, and make sure nobody else does
|
274
282
|
unless ($Job->update_attributes('is_locked_by_uuid' => $User->{'uuid'}) &&
|
275
283
|
$Job->{'is_locked_by_uuid'} == $User->{'uuid'}) {
|
276
|
-
|
284
|
+
Log(undef, "Error while updating / locking job, exiting 111");
|
285
|
+
exit(111);
|
277
286
|
}
|
278
287
|
$Job->update_attributes('started_at' => scalar gmtime,
|
279
288
|
'running' => 1,
|
@@ -688,7 +697,9 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
688
697
|
|
689
698
|
my @execargs = ('bash', '-c', $command);
|
690
699
|
srun (\@srunargs, \@execargs, undef, $build_script_to_send);
|
691
|
-
|
700
|
+
# exec() failed, we assume nothing happened.
|
701
|
+
Log(undef, "srun() failed on build script");
|
702
|
+
die;
|
692
703
|
}
|
693
704
|
close("writer");
|
694
705
|
if (!defined $childpid)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: arvados-cli
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.20140811170646
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Arvados Authors
|
@@ -166,7 +166,7 @@ dependencies:
|
|
166
166
|
- - "<"
|
167
167
|
- !ruby/object:Gem::Version
|
168
168
|
version: 1.0.0
|
169
|
-
description: This is the Arvados SDK CLI gem, git revision
|
169
|
+
description: This is the Arvados SDK CLI gem, git revision 6c91320c3a53ddbe1b81bee8ed6322c20acbd047
|
170
170
|
email: gem-dev@curoverse.com
|
171
171
|
executables:
|
172
172
|
- arv
|