Commit 205151d9 authored by Leigh B Stoller's avatar Leigh B Stoller

Use new RES_REBOOT alloc state when we know that os_setup should

reboot the node; do not rely on tbswap figuring this out; too
fragile.
parent aacf18b9
...@@ -1542,7 +1542,7 @@ sub RunAssign () ...@@ -1542,7 +1542,7 @@ sub RunAssign ()
# Node is being reused, but for a different purpose, so # Node is being reused, but for a different purpose, so
# it should be rebooted. # it should be rebooted.
# #
TBSetNodeAllocState($pnode, TBDB_ALLOCSTATE_RES_INIT_DIRTY()); TBSetNodeAllocState($pnode, TBDB_ALLOCSTATE_RES_REBOOT());
} }
} }
return 0; return 0;
...@@ -1805,7 +1805,7 @@ foreach my $pnode (sort(keys(%virtnodes))) { ...@@ -1805,7 +1805,7 @@ foreach my $pnode (sort(keys(%virtnodes))) {
elsif ($reserved_v2vmap{$virtual} ne $physical) { elsif ($reserved_v2vmap{$virtual} ne $physical) {
# Node has moved! Nuts! # Node has moved! Nuts!
TBSetNodeAllocState($physical, TBSetNodeAllocState($physical,
TBDB_ALLOCSTATE_RES_INIT_DIRTY()); TBDB_ALLOCSTATE_RES_REBOOT());
} }
} }
} }
......
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