All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 343ee139 authored by Leigh B Stoller's avatar Leigh B Stoller

Handle setup timeouts more gracefully.

parent 593aec60
......@@ -906,9 +906,12 @@ sub WaitForSliver($)
# XXX Need better handling for timeout.
print STDERR "*** $urn timed out.\n";
$webtask->output("Experiment setup on $urn timed out");
$webtask->Exited(GENIRESPONSE_TIMEDOUT);
}
$webtask->Exited(1);
return 1;
else {
$webtask->Exited(1);
}
return $webtask->exitcode();
}
$aggobj->SetStatus("ready");
$webtask->Exited(0);
......@@ -949,11 +952,14 @@ foreach my $aggobj (@aggregate_list) {
print "WaitforSliver Failure!\n";
if (defined($aggobj->webtask()->output())) {
$webtask->output($aggobj->webtask()->output());
$webtask->Exited($aggobj->webtask()->exitcode());
print $aggobj->webtask()->output() . "\n";
}
else {
$webtask->output("WaitforSliver Failure at " .
$aggobj->aggregate_urn());
$webtask->Exited(1);
}
}
if (defined($aggobj->public_url())) {
......@@ -966,7 +972,7 @@ $slice->UnLock();
if ($failed) {
$instance->SetStatus("failed");
$webtask->Exited(1);
# Webtask exit status set above.
}
else {
$instance->SetStatus("ready");
......
......@@ -141,7 +141,12 @@ function Do_GetInstanceStatus()
}
elseif ($webtask->exitcode() == 28) {
$blob["reason"] = "Your topology could not be mapped to physical ".
"resource.\n\n";
"resources.\n\n";
}
elseif ($webtask->exitcode() == 8) {
$blob["reason"] = "Your experiment timed out while setting up, ".
"most likely because one or more nodes failed to boot. The ".
"node consoles may provide more information.\n\n";
}
elseif ($webtask->exitcode() == 1) {
#
......
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