projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ab41d9
)
fix attempts to save dev job status in arvados db
author
Tom Clegg <tom@clinicalfuture.com>
Sat, 22 Jun 2013 21:43:29 +0000
(17:43 -0400)
committer
Tom Clegg <tom@clinicalfuture.com>
Sat, 22 Jun 2013 21:43:29 +0000
(17:43 -0400)
services/crunch/crunch-job
patch
|
blob
|
history
diff --git
a/services/crunch/crunch-job
b/services/crunch/crunch-job
index 7bc2a5e16ab1d8e4dbc60b65a4d1ee6a1be54086..8ab0ea377bafca15a5e270b6ec796e54dd8bc43c 100755
(executable)
--- a/
services/crunch/crunch-job
+++ b/
services/crunch/crunch-job
@@
-257,8
+257,10
@@
if ($job_has_uuid)
'todo' => 1,
'running' => 0,
'done' => 0 };
'todo' => 1,
'running' => 0,
'done' => 0 };
- unless ($Job->save() && $Job->{'is_locked_by'} == $User->{'uuid'}) {
- croak("Error while updating / locking job");
+ if ($job_has_uuid) {
+ unless ($Job->save() && $Job->{'is_locked_by'} == $User->{'uuid'}) {
+ croak("Error while updating / locking job");
+ }
}
}
}
}
@@
-410,7
+412,7
@@
else
Log (undef, "Using commit $commit for tree-ish $treeish");
if ($commit ne $treeish) {
$Job->{'script_version'} = $commit;
Log (undef, "Using commit $commit for tree-ish $treeish");
if ($commit ne $treeish) {
$Job->{'script_version'} = $commit;
- $Job->save() or croak("Error while updating job");
+
!$job_has_uuid or
$Job->save() or croak("Error while updating job");
}
}
}
}
}
}
@@
-716,7
+718,7
@@
release_allocation();
freeze();
$Job->{'output'} = &collate_output();
$Job->{'success'} = $Job->{'output'} && $success;
freeze();
$Job->{'output'} = &collate_output();
$Job->{'success'} = $Job->{'output'} && $success;
-$Job->save;
+$Job->save
if $job_has_uuid
;
if ($Job->{'output'})
{
if ($Job->{'output'})
{
@@
-750,7
+752,7
@@
sub update_progress_stats
$Job->{'tasks_summary'}->{'todo'} = $todo;
$Job->{'tasks_summary'}->{'done'} = $done;
$Job->{'tasks_summary'}->{'running'} = $running;
$Job->{'tasks_summary'}->{'todo'} = $todo;
$Job->{'tasks_summary'}->{'done'} = $done;
$Job->{'tasks_summary'}->{'running'} = $running;
- $Job->save;
+ $Job->save
if $job_has_uuid
;
Log (undef, "status: $done done, $running running, $todo todo");
$progress_is_dirty = 0;
}
Log (undef, "status: $done done, $running running, $todo todo");
$progress_is_dirty = 0;
}
@@
-1024,7
+1026,7
@@
sub collate_output
{
Log (undef, "output $joboutput");
$Job->{'output'} = $joboutput;
{
Log (undef, "output $joboutput");
$Job->{'output'} = $joboutput;
- $Job->save;
+ $Job->save
if $job_has_uuid
;
}
else
{
}
else
{
@@
-1116,11
+1118,11
@@
sub croak
sub cleanup
{
return if !$job_has_uuid;
sub cleanup
{
return if !$job_has_uuid;
- $Job->reload;
+ $Job->reload
if $job_has_uuid
;
$Job->{'running'} = 0;
$Job->{'success'} = 0;
$Job->{'finished_at'} = gmtime;
$Job->{'running'} = 0;
$Job->{'success'} = 0;
$Job->{'finished_at'} = gmtime;
- $Job->save;
+ $Job->save
if $job_has_uuid
;
}
}
@@
-1134,7
+1136,7
@@
sub save_meta
undef $metastream if !$justcheckpoint; # otherwise Log() will try to use it
Log (undef, "meta key is $loglocator");
$Job->{'log'} = $loglocator;
undef $metastream if !$justcheckpoint; # otherwise Log() will try to use it
Log (undef, "meta key is $loglocator");
$Job->{'log'} = $loglocator;
- $Job->save;
+ $Job->save
if $job_has_uuid
;
}
}
@@
-1235,7
+1237,7
@@
sub thaw
{
$Job->{$_} = $frozenjob->{$_};
}
{
$Job->{$_} = $frozenjob->{$_};
}
- $Job->save;
+ $Job->save
if $job_has_uuid
;
}
}