Commit 4b74ef96 authored by Mike Hibler's avatar Mike Hibler

Fix up the hack recognition of delay nodes

parent 756f1d56
......@@ -963,7 +963,8 @@ sub osload_setupswapinfo($$;@)
$signame = "$imageid.ndz.sig";
$signame =~ s/^$imagepid-//;
if (! -d $sigdir || ! -f "$sigdir/$signame") {
print "*** swapinfo: WARNING: no image signature for $rimageid, ".
print "*** swapinfo: WARNING: ".
"no image signature for $rimageid, ".
"cannot save swapout state!\n";
next;
}
......
......@@ -1703,9 +1703,12 @@ sub doSwapoutAction($$%)
$myargs{'timestamp'} = 1;
#
# If this is swapout disk state saving, setup a progress function
# If this is swapout disk state saving, we do lots o stuff.
#
if ($soaction{'command'} =~ /^$statesavecmd/) {
#
# Setup a progress function
#
$myargs{'pfunc'} = \&doSwapoutProgress;
$myargs{'pinterval'} = $stateinterval;
$myargs{'pcookie'} = \%state;
......@@ -1726,8 +1729,8 @@ sub doSwapoutAction($$%)
# they are delay nodes.
#
if (! -r "$swapdir/$vname.part" || ! -r "$swapdir/$vname.sig") {
# XXX do this based on role
if ($vname !~ /^tbsdelay/) {
# XXX should do this based on role, not name
if ($vname !~ /^tbs?delay\d+$/) {
tbwarn "no swap info for $node ($vname), ".
"not saving disk state!";
}
......@@ -1735,7 +1738,7 @@ sub doSwapoutAction($$%)
}
push(@enodes, $node);
$state{$node} = {
'name' => "/proj/$pid/exp/$eid/swapinfo/$vname-swap.ndz",
'name' => "$swapdir/$vname-swap.ndz",
'time' => 0,
'size' => 0
};
......
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