Commit 16ef41aa authored by Leigh Stoller's avatar Leigh Stoller

Do not move ALWAYSUP nodes into the updating_users state; they are never

going to leave that state, and it causes the Portal to paint then in
yellow since the are not "ready". A better approach would be to move
nodes out of updating_users after some amount of time has passed. Maybe
on the next trip through this part of the forest.
parent cbf598ef
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -135,6 +135,7 @@ use vars qw(@ISA @EXPORT);
TBDB_NODESTATE_VNODEBOOTSTART TBDB_NODESTATE_RELOADFAILED
TBDB_NODEOPMODE_NORMAL TBDB_NODEOPMODE_DELAYING
TBDB_NODEOPMODE_ALWAYSUP
TBDB_NODEOPMODE_UNKNOWNOS TBDB_NODEOPMODE_RELOADING
TBDB_NODEOPMODE_NORMALv1 TBDB_NODEOPMODE_MINIMAL TBDB_NODEOPMODE_PCVM
TBDB_NODEOPMODE_RELOAD TBDB_NODEOPMODE_RELOADMOTE
......@@ -524,6 +525,7 @@ sub TBDB_NODEOPMODE_UNKNOWNOS { "UNKNOWNOS"; }
sub TBDB_NODEOPMODE_RELOADING { "RELOADING"; }
sub TBDB_NODEOPMODE_NORMALv1 { "NORMALv1"; }
sub TBDB_NODEOPMODE_NORMALv2 { "NORMALv2"; }
sub TBDB_NODEOPMODE_ALWAYSUP { "ALWAYSUP"; }
sub TBDB_NODEOPMODE_MINIMAL { "MINIMAL"; }
sub TBDB_NODEOPMODE_PCVM { "PCVM"; }
sub TBDB_NODEOPMODE_RELOAD { "RELOAD"; }
......
......@@ -3617,7 +3617,8 @@ sub UpdateAccounts($$)
my $node = Node->Lookup($sliver->resource_id());
next
if (!defined($node) ||
$node->erole() ne EmulabConstants::TBDB_RSRVROLE_NODE());
$node->erole() ne EmulabConstants::TBDB_RSRVROLE_NODE() ||
$node->op_mode() eq EmulabConstants::TBDB_NODESTATE_ALWAYSUP());
$node->MarkForUpdate();
......
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