summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-17 12:54:38 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-17 12:54:38 +0100
commit6f695e3201aaa24a0672e81a24fea478479b89a4 (patch)
treef3bf79432ec73c78e026c0aaad3c414204ebfc85 /node-repository
parent2635cb9c2a8b1cd0a548185e3c7a07ee64f842b1 (diff)
Revert "Merge pull request #11805 from vespa-engine/revert-11792-bratseth/dont-allow-wrong-webserviceport"
This reverts commit 1032436c17935fa0da7aadf75cce6a51e0197756, reversing changes made to 891e243f84eab77a08ff3e42a6063e3fb3d74a87.
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java
index a54287ed082..d1e15c78a47 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java
@@ -41,7 +41,7 @@ public class NodeRebooter extends Maintainer {
@Override
protected void maintain() {
- // Reboot candidates: Nodes in long-term states, which we know can safely orchestrate a reboot
+ // Reboot candidates: Nodes in long-term states, where we know we can safely orchestrate a reboot
List<Node> nodesToReboot = nodeRepository().getNodes(Node.State.active, Node.State.ready).stream()
.filter(node -> node.flavor().getType() != Flavor.Type.DOCKER_CONTAINER)
.filter(this::shouldReboot)
@@ -66,13 +66,11 @@ public class NodeRebooter extends Maintainer {
if (overdue.isEmpty()) // should never happen as all !docker-container should have provisioned timestamp
return random.nextDouble() < interval().getSeconds() / (double) rebootInterval.getSeconds();
- if (overdue.get().isNegative())
- return false;
+ if (overdue.get().isNegative()) return false;
// Use a probability such that each maintain() schedules the same number of reboots,
// as long as 0 <= overdue <= rebootInterval, with the last maintain() in that interval
// naturally scheduling the remaining with probability 1.
-
int configServers = nodeRepository().database().cluster().size();
long secondsRemaining = Math.max(0, rebootInterval.getSeconds() - overdue.get().getSeconds());
double runsRemaining = configServers * secondsRemaining / (double) interval().getSeconds();