No longer allow suspension if in maintenance

If a storage node falls out of Slobrok, it will change from UP to Maintenance
after 60s, then after further 30s go to Down.  Avoid allowing suspension in the
30s grace period just because it is Maintenance mode.

1 files changed, 2 insertions, 4 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java
index dd33646dd31..f28fa37c7b7 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java
@@ -212,10 +212,8 @@ public class NodeStateChangeChecker {
                     oldWantedState.getState() + ": " + oldWantedState.getDescription());
         }
 
-        switch (clusterState.getNodeState(nodeInfo.getNode()).getState()) {
-            case MAINTENANCE:
-            case DOWN:
-                return Result.allowSettingOfWantedState();
+        if (clusterState.getNodeState(nodeInfo.getNode()).getState() == State.DOWN) {
+            return Result.allowSettingOfWantedState();
         }
 
         if (anotherNodeInGroupAlreadyAllowed(nodeInfo, newDescription)) {