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
6516d59d
Commit
6516d59d
authored
Sep 16, 2003
by
Leigh B. Stoller
Browse files
Quickie change to see if retry will work on a failed plab node!
parent
5bef91ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
tbsetup/assign_wrapper.in
View file @
6516d59d
...
...
@@ -3556,13 +3556,13 @@ sub LoadCurrent()
my
$query_result
=
DBQueryFatal
("
select r.vname,r.node_id,n.phys_nodeid,
"
.
"
nt.isvirtnode,nt.isremotenode
"
.
"
nt.isvirtnode,nt.isremotenode
,nt.isplabdslice
"
.
"
from reserved as r
"
.
"
left join nodes as n on n.node_id=r.node_id
"
.
"
left join node_types as nt on nt.type=n.type
"
.
"
where r.pid='
$pid
' and r.eid='
$eid
'
");
while
((
$vname
,
$reserved
,
$physnode
,
$isvirt
,
$isremote
)
=
while
((
$vname
,
$reserved
,
$physnode
,
$isvirt
,
$isremote
,
$isplab
)
=
$query_result
->
fetchrow_array
)
{
#
...
...
@@ -3570,7 +3570,7 @@ sub LoadCurrent()
#
fatal
(
1
,
"
*** $0:
\n
"
.
"
Cannot update widearea nodes yet!
")
if
(
$isremote
);
if
(
$isremote
&&
!
$isplab
);
LoadPhysNode
(
$reserved
);
...
...
tbsetup/os_setup.in
View file @
6516d59d
...
...
@@ -66,11 +66,13 @@ my $osselect = "$TB/bin/os_select";
my
$dbg
=
0
;
my
$failed
=
0
;
my
$failedvnodes
=
0
;
my
$failedplab
=
0
;
my
%nodes
=
();
my
%vnodes
=
();
my
%vnodephosts
=
();
my
%vnode2pnode
=
();
my
%pnodevcount
=
();
my
%plabvnodes
=
();
my
%osids
=
();
my
%canfail
=
();
my
$db_result
;
...
...
@@ -170,6 +172,7 @@ while (my %row = $db_result->fetchhash()) {
#
if
(
$virtnode
)
{
$vnodes
{
$node
}
=
(
$jailnode
||
$plabnode
);
$plabvnodes
{
$node
}
=
$plabnode
;
if
(
!
$jailnode
&&
!
$plabnode
)
{
next
;
}
...
...
@@ -681,7 +684,7 @@ elsif (@vnodelist) {
my
$node
=
shift
(
@vnodelist
);
my
$pnode
=
$vnode2pnode
{
$node
};
my
$wstart
=
$waitstart
{
$node
};
my
$maxwait
=
90
+
(
3
00
*
$pnodevcount
{
$pnode
});
my
$maxwait
=
90
+
(
1
00
*
$pnodevcount
{
$pnode
});
if
(
!
TBNodeStateWait
(
$node
,
TBDB_NODESTATE_ISUP
,
$wstart
,
$maxwait
))
{
print
"
$node
is alive and well
\n
";
...
...
@@ -719,7 +722,12 @@ elsif (@vnodelist) {
print
"
*** Continuing with experiment setup anyway ...
\n
";
next
;
}
$failedvnodes
++
;
if
(
$plabvnodes
{
$node
})
{
$failedplab
++
;
}
else
{
$failedvnodes
++
;
}
}
TBDebugTimeStamp
("
Virtual node waiting finished
");
}
...
...
@@ -729,6 +737,8 @@ print "*** There were $failed failed nodes\n"
if
(
$failed
);
print
"
*** There were
$failedvnodes
failed virtual nodes
\n
"
if
(
$failedvnodes
);
print
"
*** There were
$failedplab
failed plab nodes
\n
"
if
(
$failedplab
);
TBDebugTimeStamp
("
os_setup finished
");
...
...
@@ -736,7 +746,7 @@ TBDebugTimeStamp("os_setup finished");
exit
(
-
1
)
if
(
$failedvnodes
);
exit
(
1
)
if
(
$failed
);
if
(
$failed
||
$failedplab
);
exit
0
;
#
...
...
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