aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-04-16 08:29:22 +0200
committerMartin Polden <mpolden@mpolden.no>2021-04-16 08:29:22 +0200
commit30abb5d9fe47fb98be20489176ec9a4962ade491 (patch)
treebd89ebb390edbdf85d679d412cbadb7b12edc111 /node-repository/src/main/java/com
parent96d0ecfc88a765be9d6927ff559e9d7f6c8cc327 (diff)
Remove implicit reboot of nodes moving to dirty
Diffstat (limited to 'node-repository/src/main/java/com')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java12
1 files changed, 0 insertions, 12 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
index 3ed29e14527..2d8ab74ce71 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
@@ -246,21 +246,9 @@ public class CuratorDatabaseClient {
private Status newNodeStatus(Node node, Node.State toState) {
if (node.state() != Node.State.failed && toState == Node.State.failed) return node.status().withIncreasedFailCount();
if (node.state() == Node.State.failed && toState == Node.State.active) return node.status().withDecreasedFailCount(); // fail undo
- if (rebootOnTransitionTo(toState, node)) {
- return node.status().withReboot(node.status().reboot().withIncreasedWanted());
- }
return node.status();
}
- /** Returns whether to reboot node as part of transition to given state. This is done to get rid of any lingering
- * unwanted state (e.g. processes) on non-host nodes. */
- private boolean rebootOnTransitionTo(Node.State state, Node node) {
- if (node.type().isHost()) return false; // Reboot of host nodes is handled by NodeRebooter
- if (zone.environment().isTest()) return false; // We want to reuse nodes quickly in test environments
-
- return node.state() != Node.State.dirty && state == Node.State.dirty;
- }
-
/**
* Returns all nodes which are in one of the given states.
* If no states are given this returns all nodes.