From 7886432df911cc24de8a2b4df8a3572d5654bf2e Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sat, 13 May 2023 08:56:51 +0200 Subject: Set waiter in createFleetController --- .../yahoo/vespa/clustercontroller/core/FleetControllerTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java index baa5235c530..d3eaa828d6f 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java @@ -57,8 +57,7 @@ public abstract class FleetControllerTest implements Waiter { ZooKeeperTestServer zooKeeperServer; protected final List fleetControllers = new ArrayList<>(); protected List nodes = new ArrayList<>(); - // TODO: This should use the same timer as the fleet controllers (i.e. the one supplied in createFleetControllers() - private Waiter waiter = createWaiter(new FakeTimer()); + private Waiter waiter; FleetControllerTest() { try { @@ -99,7 +98,8 @@ public abstract class FleetControllerTest implements Waiter { builder.setSlobrokConnectionSpecs(getSlobrokConnectionSpecs(slobrok)); } - static FleetController createFleetController(Timer timer, FleetControllerOptions options) { + FleetController createFleetController(Timer timer, FleetControllerOptions options) { + waiter = createWaiter(timer); var context = new TestFleetControllerContext(options); var metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex(), options.clusterName()); var log = new EventLog(timer, metricUpdater); @@ -153,7 +153,6 @@ public abstract class FleetControllerTest implements Waiter { void startFleetController(Timer timer) { if ( ! fleetControllers.isEmpty()) throw new IllegalStateException("already started fleetcontroller, not starting another"); - waiter = createWaiter(timer); fleetControllers.add(createFleetController(timer, options)); } @@ -300,6 +299,7 @@ public abstract class FleetControllerTest implements Waiter { Duration timeout() { return timeout; } + // Note: This should use the same timer as the fleet controller as monitor private Impl createWaiter(Timer timer) { return new Impl(new DataRetriever() { @Override -- cgit v1.2.3