Merge pull request #20019 from vespa-engine/freva/fix-reboot-gen

Update internal reboot/restart generations regardless of state

1 files changed, 10 insertions, 10 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 92aacf8827b..f184deab375 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -438,19 +438,19 @@ public class NodeAgentImpl implements NodeAgent {
     void doConverge(NodeAgentContext context) {
         NodeSpec node = context.node();
         Optional<Container> container = getContainer(context);
-        if (!node.equals(lastNode)) {
-            logChangesToNodeSpec(context, lastNode, node);
 
-            // Current reboot generation uninitialized or incremented from outside to cancel reboot
-            if (currentRebootGeneration < node.currentRebootGeneration())
-                currentRebootGeneration = node.currentRebootGeneration();
+        // Current reboot generation uninitialized or incremented from outside to cancel reboot
+        if (currentRebootGeneration < node.currentRebootGeneration())
+            currentRebootGeneration = node.currentRebootGeneration();
 
-            // Either we have changed allocation status (restart gen. only available to allocated nodes), or
-            // restart generation has been incremented from outside to cancel restart
-            if (currentRestartGeneration.isPresent() != node.currentRestartGeneration().isPresent() ||
-                    currentRestartGeneration.map(current -> current < node.currentRestartGeneration().get()).orElse(false))
-                currentRestartGeneration = node.currentRestartGeneration();
+        // Either we have changed allocation status (restart gen. only available to allocated nodes), or
+        // restart generation has been incremented from outside to cancel restart
+        if (currentRestartGeneration.isPresent() != node.currentRestartGeneration().isPresent() ||
+                currentRestartGeneration.map(current -> current < node.currentRestartGeneration().get()).orElse(false))
+            currentRestartGeneration = node.currentRestartGeneration();
 
+        if (!node.equals(lastNode)) {
+            logChangesToNodeSpec(context, lastNode, node);
             lastNode = node;
         }