Commit bf7d3631 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Do not generate a fatal error and email when remote cluster times out

getting the reservation system prediction info for the instantiate page.
It does not prevent the page from operating, and the timeout is always
transient.
parent f77641a1
......@@ -877,7 +877,7 @@ sub DoPrediction()
push(@agglist, {"authority" => $auth,
"webtask" => $temptask});
}
if (ParRun({"maxwaittime" => 60,
if (ParRun({"maxwaittime" => 30,
"maxchildren" => scalar(@agglist)},
\@return_codes, $coderef, @agglist)) {
#
......@@ -900,6 +900,16 @@ sub DoPrediction()
$wtask->Refresh();
if ($code) {
#
# If this timed out, lets not return a fatal error since
# this info is informational and does not prevent the web
# server from operating normally.
#
if ($code == 15) {
$blob->{$auth->urn()} = "Timed out getting reservation ".
"system information";
next;
}
$errmsg = "$auth: " . $wtask->output();
goto bad;
}
......
......@@ -1069,6 +1069,11 @@ $(function ()
var cluster = $(this).attr('urn');
if (_.has(resinfo, cluster) && resinfo[cluster] != null) {
if (typeof(resinfo[cluster]) == "string") {
console.info("Timed out getting reservation system " +
"info for cluster " + cluster);
return;
}
/*
* Upcoming is lower priority so do first.
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment