From 3905375a2eda19877de1d6c32bf5c614cc9ab5d5 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 15 Nov 2019 10:41:37 +0100 Subject: Get actual number of config servers --- .../com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java | 2 +- .../vespa/hosted/provision/maintenance/MaintenanceTester.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'node-repository') 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 d81d01bc941..a54287ed082 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 @@ -73,7 +73,7 @@ public class NodeRebooter extends Maintainer { // as long as 0 <= overdue <= rebootInterval, with the last maintain() in that interval // naturally scheduling the remaining with probability 1. - int configServers = 3; + int configServers = nodeRepository().database().cluster().size(); long secondsRemaining = Math.max(0, rebootInterval.getSeconds() - overdue.get().getSeconds()); double runsRemaining = configServers * secondsRemaining / (double) interval().getSeconds(); double probability = 1 / (1 + runsRemaining); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java index afada3c6f0f..a4b66d3cf9e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java @@ -8,7 +8,6 @@ import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.Zone; import com.yahoo.test.ManualClock; -import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.curator.mock.MockCurator; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeRepository; @@ -29,7 +28,7 @@ import java.util.stream.Collectors; */ public class MaintenanceTester { - private final Curator curator = new MockCurator(); + private final MockCurator curator = new MockCurator(); public final ManualClock clock = new ManualClock(Instant.ofEpochMilli(0L)); // determinism private final Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); private final NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default"); @@ -38,6 +37,10 @@ public class MaintenanceTester { DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), true); + public MaintenanceTester() { + curator.setZooKeeperEnsembleConnectionSpec("zk1.host:1,zk2.host:2,zk3.host:3"); + } + public NodeRepository nodeRepository() { return nodeRepository; } public void createReadyTenantNodes(int count) { -- cgit v1.2.3