Skip to content
GitLab
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
0115ea3b
Commit
0115ea3b
authored
Feb 27, 2017
by
Leigh B Stoller
Browse files
Do a better job of looking for failure messages while waiting and report
to the web UI.
parent
5043234d
Changes
1
Hide whitespace changes
Inline
Side-by-side
apt/APT_Instance.pm.in
View file @
0115ea3b
...
...
@@ -330,8 +330,10 @@ sub Stringify($)
my
($
self
)
=
@
_
;
my
$
uuid
=
$
self
->
uuid
();
my
$
pid
=
$
self
->
pid
();
my
$
name
=
$
self
->
name
();
return
"[APT_Instance: $
uuid
]"
;
return
"[APT_Instance: $
pid,$name
]"
;
}
sub
LookupBySlice
($$)
...
...
@@ -2675,8 +2677,12 @@ sub WaitForSliver($)
}
elsif
($
repblob
->{
'status'
}
eq
"failed"
)
{
$
failed
=
1
;
my
$
msg
=
$
repblob
->{
'error'
}
if
(
defined
($
repblob
->{
'error'
})
&&
$
repblob
->{
'error'
}
ne
""
);
print
STDERR
"*** $urn failed
\n
"
;
$
webtask
->
output
(
"Experiment setup on $urn failed"
);
print
STDERR
" "
.
$
repblob
->{
'error'
}
.
"
\n
"
if
($
msg
);
$
webtask
->
output
(
"Experiment setup on $urn failed"
.
($
msg
?
": $msg"
:
"."
));
last
;
}
elsif
($
aggobj
->
instance
()->
IsCanceled
())
{
...
...
@@ -2689,7 +2695,11 @@ sub WaitForSliver($)
}
if
($
failed
||
!$ready) {
$
aggobj
->
SetStatus
(
"failed"
);
if
(
!$ready) {
if
($
failed
)
{
#
Output
set
above
.
$
webtask
->
Exited
(
GENIRESPONSE_ERROR
);
}
elsif
(
!$ready) {
#
XXX
Need
better
handling
for
timeout
.
print
STDERR
"*** $urn timed out.
\n
"
;
$
webtask
->
output
(
"Experiment setup on $urn timed out"
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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