From 7a8571355a737aab02934ad5cf9fc8521c429b54 Mon Sep 17 00:00:00 2001 From: Andreas Eriksen Date: Tue, 18 Oct 2022 15:09:55 +0200 Subject: Revert "Do not update history if reboot generation is unchanged" (#24494) Co-authored-by: Martin Polden --- .../src/main/java/com/yahoo/vespa/hosted/provision/Node.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java index d9e0e4292e8..9cba823500b 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java @@ -468,13 +468,10 @@ public final class Node implements Nodelike { /** Returns a copy of this node with the current reboot generation set to the given number at the given instant */ public Node withCurrentRebootGeneration(long generation, Instant instant) { - if (generation == status.reboot().current()) { - return this; // No change - } - if (generation < status.reboot().current()) { + if (generation < status.reboot().current()) throw new IllegalArgumentException("Cannot set reboot generation to " + generation + - ": lower than current generation: " + status.reboot().current()); - } + ": lower than current generation: " + status.reboot().current()); + Status newStatus = status().withReboot(status().reboot().withCurrent(generation)); History newHistory = history.with(new History.Event(History.Event.Type.rebooted, Agent.system, instant)); return this.with(newStatus).with(newHistory); -- cgit v1.2.3