ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Distinguish between permanent evaluation errors and transient input errors

Browse Source 
Fixes #112.
This commit is contained in:
Eelco Dolstra
2013-09-25 16:21:16 +02:00
parent e1c9e28589
commit d46ebeea99
6 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/script/hydra-evaluator
View File

@ -46,7 +46,7 @@ sub setJobsetError {
eval {
txn_do($db, sub {
$jobset->update({errormsg => $errorMsg, errortime => time});
$jobset->update({ errormsg => $errorMsg, errortime => time, fetcherrormsg => undef });
});
};
if ($errorMsg ne $prevError) {
@ -115,7 +115,17 @@ sub checkJobsetWrapped {
# Fetch all values for all inputs.
my $checkoutStart = time;
fetchInputs($project, $jobset, $inputInfo);
eval {
fetchInputs($project, $jobset, $inputInfo);
};
if ($@) {
my $msg = $@;
print STDERR $msg;
txn_do($db, sub {
$jobset->update({ lastcheckedtime => time, fetcherrormsg => $msg });
});
return;
}
my $checkoutStop = time;
# Hash the arguments to hydra-eval-jobs and check the
@ -127,7 +137,7 @@ sub checkJobsetWrapped {
if (defined $prevEval && $prevEval->hash eq $argsHash) {
print STDERR " jobset is unchanged, skipping\n";
txn_do($db, sub {
$jobset->update({lastcheckedtime => time});
$jobset->update({ lastcheckedtime => time, fetcherrormsg => undef });
});
return;
}
@ -253,7 +263,7 @@ sub checkJobsetWrapped {
}
$msg .=
($error->{location} ne "" ? "in job ‘$error->{location}’" : "at top-level") .
" [$bindings]:\n" . $error->{msg} . "\n\n";
":\n" . $error->{msg} . "\n\n";
}
setJobsetError($jobset, $msg);
}
@ -275,7 +285,7 @@ sub checkJobset {
if ($@) {
my $msg = $@;
print STDERR "error evaluating jobset ", $jobset->name, ": $msg";
print STDERR $msg;
txn_do($db, sub {
$jobset->update({lastcheckedtime => time});
setJobsetError($jobset, $msg);