Commit 74846b81 authored by Leigh Stoller's avatar Leigh Stoller

Respect the failuremode of the node; previously we wired the canfail

bit based on type (plab nodes allowed to fail).

The default in the DB is nofail for all nodes.
parent 8eaa19b6
......@@ -164,6 +164,7 @@ while (my %row = $db_result->fetchhash()) {
my $virtnode = $row{'isvirtnode'};
my $jailnode = $row{'jailflag'};
my $plabnode = $row{'isplabdslice'};
my $failmode = $row{'failureaction'};
my $bootpath = 0;
#
......@@ -398,15 +399,9 @@ while (my %row = $db_result->fetchhash()) {
}
#
# Set the canfail bit. Currently, sharks are always canfail=1.
# Will come from DB at some point.
# Set the canfail bit.
#
if ($plabnode) {
$canfail{$node} = 1;
}
else {
$canfail{$node} = 0;
}
$canfail{$node} = (($failmode eq NODEFAILMODE_FATAL()) ? 0 : 1);
print STDERR "$node - $osids{$node} - $canfail{$node}\n"
if $dbg;
......
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