Commit 721bb6bc authored by Kirk Webb's avatar Kirk Webb

Clear taint states from nodes in the proper place (on 'reloading' exit).

Move the taint clearing action so that it happens as the node exits
the "reloading" experiment (vs. when it goes into reloading).
parent d9c27fac
......@@ -1164,11 +1164,11 @@ sub handleCtrlEvent($$) {
info("$node: Clearing reload info\n");
$nodeobj->ClearCurrentReload();
$nodeobj->FlushReserved();
$nodeobj->SyncDiskPartitionTaintStates();
my $experiment = $nodeobj->Reservation();
if (defined($experiment) &&
$experiment->pid() eq NODERELOADING_PID &&
$experiment->eid() eq NODERELOADING_EID) {
$nodeobj->RemoveTaintState();
$nodeobj->ClearSchedReload();
my $reserved_pid = $nodeobj->CheckPreReserve(1);
if (defined($reserved_pid)) {
......@@ -1178,6 +1178,8 @@ sub handleCtrlEvent($$) {
$nodeobj->SetNodeHistory(TB_NODEHISTORY_OP_FREE,
undef, $experiment);
info("$node: Released from $experiment\n");
} else {
$nodeobj->SyncDiskPartitionTaintStates();
}
if ($event eq $TBRELOADDONEV2) {
info("$node: Sending apod\n");
......
......@@ -473,9 +473,6 @@ while (1) {
$nodeobj->SetNodeHistory(TB_NODEHISTORY_OP_MOVE, undef,
$reloading_experiment);
}
# Clear any taint states set for the node since it's going
# to be reloaded.
$nodeobj->RemoveTaintState();
}
# It is now safe to clear this.
@retry_list = ();
......
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