Improve logging of FleetController and DatabaseHandler

12 files changed, 79 insertions, 62 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java
index 308a78ee40e..80f88c57cb3 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java
@@ -48,16 +48,17 @@ public class ClusterFeedBlockTest extends FleetControllerTest {
             nodes.add(new Node(NodeType.DISTRIBUTOR, i));
         }
 
+        var context = new TestContext(options);
         communicator = new DummyCommunicator(nodes, timer);
-        MetricUpdater metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex, options.clusterName);
-        EventLog eventLog = new EventLog(timer, metricUpdater);
-        ContentCluster cluster = new ContentCluster(options.clusterName, options.nodes, options.storageDistribution);
-        NodeStateGatherer stateGatherer = new NodeStateGatherer(timer, timer, eventLog);
-        DatabaseHandler database = new DatabaseHandler(new ZooKeeperDatabaseFactory(), timer, options.zooKeeperServerAddress, options.fleetControllerIndex, timer);
-        StateChangeHandler stateGenerator = new StateChangeHandler(timer, eventLog);
-        SystemStateBroadcaster stateBroadcaster = new SystemStateBroadcaster(timer, timer);
-        MasterElectionHandler masterElectionHandler = new MasterElectionHandler(options.fleetControllerIndex, options.fleetControllerCount, timer, timer);
-        ctrl = new FleetController(timer, eventLog, cluster, stateGatherer, communicator, null, null, communicator, database, stateGenerator, stateBroadcaster, masterElectionHandler, metricUpdater, options);
+        var metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex, options.clusterName);
+        var eventLog = new EventLog(timer, metricUpdater);
+        var cluster = new ContentCluster(options.clusterName, options.nodes, options.storageDistribution);
+        var stateGatherer = new NodeStateGatherer(timer, timer, eventLog);
+        var database = new DatabaseHandler(context, new ZooKeeperDatabaseFactory(), timer, options.zooKeeperServerAddress, timer);
+        var stateGenerator = new StateChangeHandler(timer, eventLog);
+        var stateBroadcaster = new SystemStateBroadcaster(timer, timer);
+        var masterElectionHandler = new MasterElectionHandler(context, options.fleetControllerIndex, options.fleetControllerCount, timer, timer);
+        ctrl = new FleetController(context, timer, eventLog, cluster, stateGatherer, communicator, null, null, communicator, database, stateGenerator, stateBroadcaster, masterElectionHandler, metricUpdater, options);
 
         ctrl.tick();
         markAllNodesAsUp(options);
@@ -134,8 +135,7 @@ public class ClusterFeedBlockTest extends FleetControllerTest {
         assertTrue(ctrl.getClusterStateBundle().clusterFeedIsBlocked());
 
         // Increase cheese allowance. Should now automatically unblock since reported usage is lower.
-        int dummyConfigGeneration = 2;
-        ctrl.updateOptions(createOptions(mapOf(usage("cheese", 0.9), usage("wine", 0.4))), dummyConfigGeneration);
+        ctrl.updateOptions(createOptions(mapOf(usage("cheese", 0.9), usage("wine", 0.4))));
         ctrl.tick(); // Options propagation
         ctrl.tick(); // State recomputation
         assertFalse(ctrl.getClusterStateBundle().clusterFeedIsBlocked());
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java
index 630a4898dfa..57468ffa0e7 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java
@@ -10,7 +10,6 @@ import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
@@ -41,8 +40,8 @@ public class DatabaseHandlerTest {
             when(mockTimer.getCurrentTimeInMillis()).thenReturn(1000000L);
         }
 
-        DatabaseHandler.Context createMockContext() {
-            return new DatabaseHandler.Context() {
+        DatabaseHandler.DatabaseContext createMockContext() {
+            return new DatabaseHandler.DatabaseContext() {
                 @Override
                 public ContentCluster getCluster() {
                     return clusterFixture.cluster();
@@ -66,7 +65,9 @@ public class DatabaseHandlerTest {
         }
 
         DatabaseHandler createHandler() throws Exception {
-            return new DatabaseHandler(mockDbFactory, mockTimer, databaseAddress, 0, monitor);
+            Context context = mock(Context.class);
+            when(context.id()).thenReturn(new FleetControllerId("clusterName", 0));
+            return new DatabaseHandler(context, mockDbFactory, mockTimer, databaseAddress, monitor);
         }
     }
 
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java
index 0f172f6f248..e8f20a00d24 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java
@@ -39,12 +39,12 @@ public class DistributionBitCountTest extends FleetControllerTest {
     public void testDistributionBitCountConfigIncrease() throws Exception {
         setUpSystem("DistributionBitCountTest::testDistributionBitCountConfigIncrease");
         options.distributionBits = 20;
-        fleetController.updateOptions(options, 0);
+        fleetController.updateOptions(options);
         ClusterState currentState = waitForState("version:\\d+ bits:20 distributor:10 storage:10");
 
         int version = currentState.getVersion();
         options.distributionBits = 23;
-        fleetController.updateOptions(options, 0);
+        fleetController.updateOptions(options);
         assertEquals(version, currentState.getVersion());
     }
 
@@ -55,7 +55,7 @@ public class DistributionBitCountTest extends FleetControllerTest {
     public void testDistributionBitCountConfigDecrease() throws Exception {
         setUpSystem("DistributionBitCountTest::testDistributionBitCountConfigDecrease");
         options.distributionBits = 12;
-        fleetController.updateOptions(options, 0);
+        fleetController.updateOptions(options);
         waitForState("version:\\d+ bits:12 distributor:10 storage:10");
     }
 
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 55677782a3d..d9e20171681 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
@@ -157,15 +157,16 @@ public abstract class FleetControllerTest implements Waiter {
 
     FleetController createFleetController(boolean useFakeTimer, FleetControllerOptions options, boolean startThread, StatusPageServerInterface status) throws Exception {
         Objects.requireNonNull(status, "status server cannot be null");
+        var context = new TestContext(options);
         Timer timer = useFakeTimer ? this.timer : new RealTimer();
-        MetricUpdater metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex, options.clusterName);
-        EventLog log = new EventLog(timer, metricUpdater);
-        ContentCluster cluster = new ContentCluster(
+        var metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex, options.clusterName);
+        var log = new EventLog(timer, metricUpdater);
+        var cluster = new ContentCluster(
                 options.clusterName,
                 options.nodes,
                 options.storageDistribution);
-        NodeStateGatherer stateGatherer = new NodeStateGatherer(timer, timer, log);
-        Communicator communicator = new RPCCommunicator(
+        var stateGatherer = new NodeStateGatherer(timer, timer, log);
+        var communicator = new RPCCommunicator(
                 RPCCommunicator.createRealSupervisor(),
                 timer,
                 options.fleetControllerIndex,
@@ -173,20 +174,20 @@ public abstract class FleetControllerTest implements Waiter {
                 options.nodeStateRequestTimeoutEarliestPercentage,
                 options.nodeStateRequestTimeoutLatestPercentage,
                 options.nodeStateRequestRoundTripTimeMaxSeconds);
-        SlobrokClient lookUp = new SlobrokClient(timer);
+        var lookUp = new SlobrokClient(timer);
         lookUp.setSlobrokConnectionSpecs(new String[0]);
-        RpcServer rpcServer = new RpcServer(timer, timer, options.clusterName, options.fleetControllerIndex, options.slobrokBackOffPolicy);
-        DatabaseHandler database = new DatabaseHandler(new ZooKeeperDatabaseFactory(), timer, options.zooKeeperServerAddress, options.fleetControllerIndex, timer);
+        var rpcServer = new RpcServer(timer, timer, options.clusterName, options.fleetControllerIndex, options.slobrokBackOffPolicy);
+        var database = new DatabaseHandler(context, new ZooKeeperDatabaseFactory(), timer, options.zooKeeperServerAddress, timer);
 
         // Setting this <1000 ms causes ECONNREFUSED on socket trying to connect to ZK server, in ZooKeeper,
         // after creating a new ZooKeeper (session).  This causes ~10s extra time to connect after connection loss.
         // Reasons unknown.  Larger values like the default 10_000 causes that much additional running time for some tests.
         database.setMinimumWaitBetweenFailedConnectionAttempts(2_000);
 
-        StateChangeHandler stateGenerator = new StateChangeHandler(timer, log);
-        SystemStateBroadcaster stateBroadcaster = new SystemStateBroadcaster(timer, timer);
-        MasterElectionHandler masterElectionHandler = new MasterElectionHandler(options.fleetControllerIndex, options.fleetControllerCount, timer, timer);
-        FleetController controller = new FleetController(timer, log, cluster, stateGatherer, communicator, status, rpcServer, lookUp, database, stateGenerator, stateBroadcaster, masterElectionHandler, metricUpdater, options);
+        var stateGenerator = new StateChangeHandler(timer, log);
+        var stateBroadcaster = new SystemStateBroadcaster(timer, timer);
+        var masterElectionHandler = new MasterElectionHandler(context, options.fleetControllerIndex, options.fleetControllerCount, timer, timer);
+        var controller = new FleetController(context, timer, log, cluster, stateGatherer, communicator, status, rpcServer, lookUp, database, stateGenerator, stateBroadcaster, masterElectionHandler, metricUpdater, options);
         if (startThread) {
             controller.start();
         }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownLiveConfigTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownLiveConfigTest.java
index 77bcff1e7d5..e6c5c31010f 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownLiveConfigTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownLiveConfigTest.java
@@ -9,8 +9,6 @@ import static org.junit.Assert.assertFalse;
 
 public class GroupAutoTakedownLiveConfigTest extends FleetControllerTest {
 
-    private long mockConfigGeneration = 1;
-
     private static FleetControllerOptions createOptions(DistributionBuilder.GroupBuilder groupBuilder, double minNodeRatio) {
         FleetControllerOptions options = defaultOptions("mycluster");
         options.setStorageDistribution(DistributionBuilder.forHierarchicCluster(groupBuilder));
@@ -21,8 +19,7 @@ public class GroupAutoTakedownLiveConfigTest extends FleetControllerTest {
     }
 
     private void updateConfigLive(FleetControllerOptions newOptions) {
-        ++mockConfigGeneration;
-        this.fleetController.updateOptions(newOptions, mockConfigGeneration);
+        this.fleetController.updateOptions(newOptions);
     }
 
     private void reconfigureWithMinNodeRatio(double minNodeRatio) {
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownTest.java
index 83167367a91..a3bc39bde39 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownTest.java
@@ -307,7 +307,7 @@ public class GroupAutoTakedownTest {
         assertEquals("distributor:6 storage:6 .4.t:123456", fixture.generatedClusterState());
 
         DatabaseHandler handler = mock(DatabaseHandler.class);
-        DatabaseHandler.Context context = mock(DatabaseHandler.Context.class);
+        DatabaseHandler.DatabaseContext context = mock(DatabaseHandler.DatabaseContext.class);
         when(context.getCluster()).thenReturn(fixture.cluster);
 
         Set<ConfiguredNode> nodes = new HashSet<>(fixture.cluster.clusterInfo().getConfiguredNodes().values());
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
index 8d32986bcaf..bf3efb17ddf 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
@@ -7,7 +7,6 @@ import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Target;
 import com.yahoo.jrt.Transport;
 import com.yahoo.jrt.slobrok.server.Slobrok;
-import java.util.logging.Level;
 import com.yahoo.vdslib.state.ClusterState;
 import com.yahoo.vdslib.state.NodeState;
 import com.yahoo.vdslib.state.NodeType;
@@ -22,6 +21,7 @@ import org.junit.rules.Timeout;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -296,7 +296,7 @@ public class MasterElectionTest extends FleetControllerTest {
         for (FleetController fc : fleetControllers) {
             FleetControllerOptions myoptions = fc.getOptions();
             myoptions.zooKeeperServerAddress = zooKeeperServer.getAddress();
-            fc.updateOptions(myoptions, 0);
+            fc.updateOptions(myoptions);
             log.log(Level.INFO, "Should now have sent out new zookeeper server address " + myoptions.zooKeeperServerAddress + " to fleetcontroller " + myoptions.fleetControllerIndex);
         }
         timer.advanceTime(10 * 1000); // Wait long enough for fleetcontroller wanting to retry zookeeper connection
@@ -447,7 +447,7 @@ public class MasterElectionTest extends FleetControllerTest {
         FleetControllerOptions newOptions = options.clone();
         for (int i=0; i<fleetControllers.size(); ++i) {
             FleetControllerOptions nodeOptions = adjustConfig(newOptions, i, fleetControllers.size());
-            fleetControllers.get(i).updateOptions(nodeOptions, 2);
+            fleetControllers.get(i).updateOptions(nodeOptions);
         }
         waitForMaster(0);
         log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java
index c1f1d0e1bc1..ea539cc13e0 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java
@@ -46,7 +46,7 @@ public class NodeSlobrokConfigurationMembershipTest extends FleetControllerTest
         // cluster. If we do not re-fetch state from slobrok we risk racing
         nodeIndices.add(foreignNode);
         options.nodes = asConfiguredNodes(nodeIndices);
-        fleetController.updateOptions(options, 0);
+        fleetController.updateOptions(options);
         // Need to treat cluster as having 6 nodes due to ideal state algo semantics.
         // Note that we do not use subsetWaiter here since we want node 6 included.
         waitForState("version:\\d+ distributor:7 .4.s:d .5.s:d storage:7 .4.s:d .5.s:d");
@@ -65,13 +65,13 @@ public class NodeSlobrokConfigurationMembershipTest extends FleetControllerTest
         assertTrue(configuredNodes.remove(new ConfiguredNode(0, false)));
         configuredNodes.add(new ConfiguredNode(0, true));
         options.nodes = configuredNodes;
-        fleetController.updateOptions(options, 0);
+        fleetController.updateOptions(options);
 
         waitForState("version:\\d+ distributor:4 storage:4 .0.s:r");
 
         // Now remove the retired node entirely from config
         assertTrue(configuredNodes.remove(new ConfiguredNode(0, true)));
-        fleetController.updateOptions(options, 0);
+        fleetController.updateOptions(options);
 
         // The previously retired node should now be marked as down, as it no longer
         // exists from the point of view of the content cluster. We have to use a subset
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
index 05ee96500d5..fee1d33725c 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
@@ -346,7 +346,7 @@ public class RpcServerTest extends FleetControllerTest {
             options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs;
             this.options.maxInitProgressTime = 30000;
             this.options.stableStateTimePeriod = 60000;
-            fleetController.updateOptions(options, 0);
+            fleetController.updateOptions(options);
             waitForState("version:\\d+ distributor:7 storage:7 .0.s:m .1.s:m .2.s:r .3.s:r .4.s:r");
         }
 
@@ -376,7 +376,7 @@ public class RpcServerTest extends FleetControllerTest {
             options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs;
             this.options.maxInitProgressTime = 30000;
             this.options.stableStateTimePeriod = 60000;
-            fleetController.updateOptions(options, 0);
+            fleetController.updateOptions(options);
             waitForState("version:\\d+ distributor:7 storage:7 .0.s:m .1.s:m");
         }
 
@@ -415,7 +415,7 @@ public class RpcServerTest extends FleetControllerTest {
             options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs;
             this.options.maxInitProgressTime = 30000;
             this.options.stableStateTimePeriod = 60000;
-            fleetController.updateOptions(options, 0);
+            fleetController.updateOptions(options);
             waitForState("version:\\d+ distributor:5 storage:5");
         }
 
@@ -430,7 +430,7 @@ public class RpcServerTest extends FleetControllerTest {
             options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs;
             this.options.maxInitProgressTime = 30000;
             this.options.stableStateTimePeriod = 60000;
-            fleetController.updateOptions(options, 0);
+            fleetController.updateOptions(options);
             waitForState("version:\\d+ distributor:7 storage:7 .0.s:r .1.s:r .2.s:r .3.s:r .4.s:r");
         }
 
@@ -444,7 +444,7 @@ public class RpcServerTest extends FleetControllerTest {
             options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs;
             this.options.maxInitProgressTime = 30000;
             this.options.stableStateTimePeriod = 60000;
-            fleetController.updateOptions(options, 0);
+            fleetController.updateOptions(options);
             waitForState("version:\\d+ distributor:7 storage:7 .0.s:r .1.s:r .2.s:r .3.s:r .4.s:r");
         }
 
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
index 2a0ab389865..e7aae087626 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
@@ -16,12 +16,6 @@ import com.yahoo.vespa.clustercontroller.utils.util.NoMetricReporter;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,6 +23,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class StateChangeTest extends FleetControllerTest {
 
     public static Logger log = Logger.getLogger(StateChangeTest.class.getName());
@@ -49,16 +49,17 @@ public class StateChangeTest extends FleetControllerTest {
             nodes.add(new Node(NodeType.DISTRIBUTOR, i));
         }
 
+        var context = new TestContext(options);
         communicator = new DummyCommunicator(nodes, timer);
-        MetricUpdater metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex, options.clusterName);
+        var metricUpdater = new MetricUpdater(new NoMetricReporter(), options.fleetControllerIndex, options.clusterName);
         eventLog = new EventLog(timer, metricUpdater);
-        ContentCluster cluster = new ContentCluster(options.clusterName, options.nodes, options.storageDistribution);
-        NodeStateGatherer stateGatherer = new NodeStateGatherer(timer, timer, eventLog);
-        DatabaseHandler database = new DatabaseHandler(new ZooKeeperDatabaseFactory(), timer, options.zooKeeperServerAddress, options.fleetControllerIndex, timer);
-        StateChangeHandler stateGenerator = new StateChangeHandler(timer, eventLog);
-        SystemStateBroadcaster stateBroadcaster = new SystemStateBroadcaster(timer, timer);
-        MasterElectionHandler masterElectionHandler = new MasterElectionHandler(options.fleetControllerIndex, options.fleetControllerCount, timer, timer);
-        ctrl = new FleetController(timer, eventLog, cluster, stateGatherer, communicator, null, null, communicator, database, stateGenerator, stateBroadcaster, masterElectionHandler, metricUpdater, options);
+        var cluster = new ContentCluster(options.clusterName, options.nodes, options.storageDistribution);
+        var stateGatherer = new NodeStateGatherer(timer, timer, eventLog);
+        var database = new DatabaseHandler(context, new ZooKeeperDatabaseFactory(), timer, options.zooKeeperServerAddress, timer);
+        var stateGenerator = new StateChangeHandler(timer, eventLog);
+        var stateBroadcaster = new SystemStateBroadcaster(timer, timer);
+        var masterElectionHandler = new MasterElectionHandler(context, options.fleetControllerIndex, options.fleetControllerCount, timer, timer);
+        ctrl = new FleetController(context, timer, eventLog, cluster, stateGatherer, communicator, null, null, communicator, database, stateGenerator, stateBroadcaster, masterElectionHandler, metricUpdater, options);
 
         ctrl.tick();
         if (options.fleetControllerCount == 1) {
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java
index dfbe4d5a8e8..84b479cfc29 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java
@@ -55,8 +55,8 @@ public class SystemStateBroadcasterTest {
         }
     }
 
-    private static DatabaseHandler.Context dbContextFrom(ContentCluster cluster) {
-        return new DatabaseHandler.Context() {
+    private static DatabaseHandler.DatabaseContext dbContextFrom(ContentCluster cluster) {
+        return new DatabaseHandler.DatabaseContext() {
             @Override
             public ContentCluster getCluster() {
                 return cluster;
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestContext.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestContext.java
new file mode 100644
index 00000000000..1a7c2659bd6
--- /dev/null
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/TestContext.java
@@ -0,0 +1,17 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.clustercontroller.core;
+
+/**
+ * @author hakon
+ */
+public class TestContext extends ContextImpl {
+    public TestContext(FleetControllerOptions options) {
+        super(options);
+    }
+
+    @Override
+    protected String withLogPrefix(String message) {
+        // Include fleet controller index in prefix in tests, since many may be running
+        return id() + ": " + message;
+    }
+}