Commit 2c5a5cce authored by Mac Newbold's avatar Mac Newbold
Browse files

Only force op_mode change if it will prevent getting stuck in frisbee.

parent 2a5ddd3f
...@@ -422,7 +422,9 @@ sub stateTransition($$) { ...@@ -422,7 +422,9 @@ sub stateTransition($$) {
if ($os_op_mode ne $mode) { if ($os_op_mode ne $mode) {
my $str = "Node $node is running OS '$osid' but in mode '$mode' ". my $str = "Node $node is running OS '$osid' but in mode '$mode' ".
"instead of mode '$os_op_mode'!\n"; "instead of mode '$os_op_mode'!\n";
if ($os_op_mode ne "") { # For now, only force if we're going into reload mode, so we
# don't get stuck looping in reloading.
if ($os_op_mode eq "RELOAD") {
DBQueryFatal("UPDATE nodes SET op_mode='$os_op_mode', ". DBQueryFatal("UPDATE nodes SET op_mode='$os_op_mode', ".
"op_mode_timestamp=unix_timestamp(now()) ". "op_mode_timestamp=unix_timestamp(now()) ".
"WHERE node_id='$node'"); "WHERE node_id='$node'");
......
Supports Markdown
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