Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
343ee139
Commit
343ee139
authored
Oct 05, 2015
by
Leigh B Stoller
Browse files
Handle setup timeouts more gracefully.
parent
593aec60
Changes
2
Hide whitespace changes
Inline
Side-by-side
apt/create_instance.in
View file @
343ee139
...
...
@@ -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
");
$w
ebtask
->
Exited
(
1
);
# W
ebtask
exit status set above.
}
else
{
$instance
->
SetStatus
("
ready
");
...
...
www/aptui/status.ajax
View file @
343ee139
...
...
@@ -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
)
{
#
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment