Revert "Cosmetic changes"

This reverts commit 0293a4fed6d1d6293e907e6a2c5bf38ecb48775c.

2 files changed, 15 insertions, 19 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index 966f6db8deb..6876ac8cf56 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -1003,7 +1003,7 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta
     private boolean atFirstClusterStateSendTimeEdge() {
         // We only care about triggering a state recomputation for the master, which is the only
         // one allowed to actually broadcast any states.
-        if (!isMaster || systemStateBroadcaster.hasBroadcastClusterStateBundle()) {
+        if (!isMaster || systemStateBroadcaster.hasBroadcastedClusterStateBundle()) {
             return false;
         }
         return hasPassedFirstStateBroadcastTimePoint(timer.getCurrentTimeInMillis());
@@ -1021,7 +1021,7 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta
             if ( ! isMaster) {
                 // If we just became master, restore state from ZooKeeper
                 stateChangeHandler.setStateChangedFlag();
-                systemStateBroadcaster.resetBroadcastClusterStateBundle();
+                systemStateBroadcaster.resetBroadcastedClusterStateBundle();
 
                 stateVersionTracker.setVersionRetrievedFromZooKeeper(database.getLatestSystemStateVersion());
                 ClusterStateBundle previousBundle = database.getLatestClusterStateBundle();
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
index 9e8e7a69c6e..cc121a8b120 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
@@ -15,8 +15,6 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.logging.Logger;
 
-import static com.yahoo.vespa.clustercontroller.core.database.DatabaseHandler.DatabaseContext;
-
 public class SystemStateBroadcaster {
 
     private static final Logger log = Logger.getLogger(SystemStateBroadcaster.class.getName());
@@ -53,11 +51,11 @@ public class SystemStateBroadcaster {
         return clusterStateBundle.getBaselineClusterState();
     }
 
-    public boolean hasBroadcastClusterStateBundle() {
+    public boolean hasBroadcastedClusterStateBundle() {
         return clusterStateBundle != null;
     }
 
-    public void resetBroadcastClusterStateBundle() {
+    public void resetBroadcastedClusterStateBundle() {
         clusterStateBundle = null;
     }
 
@@ -188,7 +186,7 @@ public class SystemStateBroadcaster {
         return nodeIsReachable(node);
     }
 
-    private List<NodeInfo> resolveStateVersionSendSet(DatabaseContext dbContext) {
+    private List<NodeInfo> resolveStateVersionSendSet(DatabaseHandler.DatabaseContext dbContext) {
         return dbContext.getCluster().getNodeInfos().stream()
                         .filter(this::nodeNeedsClusterStateBundle)
                         .filter(node -> !newestStateBundleAlreadySentToNode(node))
@@ -196,7 +194,7 @@ public class SystemStateBroadcaster {
     }
 
     // Precondition: no nodes in the cluster need to receive the current cluster state version bundle
-    private List<NodeInfo> resolveStateActivationSendSet(DatabaseContext dbContext) {
+    private List<NodeInfo> resolveStateActivationSendSet(DatabaseHandler.DatabaseContext dbContext) {
         return dbContext.getCluster().getNodeInfos().stream()
                         .filter(this::nodeNeedsClusterStateActivation)
                         .filter(node -> !newestStateActivationAlreadySentToNode(node))
@@ -217,7 +215,7 @@ public class SystemStateBroadcaster {
      * object and updates the broadcaster's last known in-sync cluster state version.
      */
     void checkIfClusterStateIsAckedByAllDistributors(DatabaseHandler database,
-                                                     DatabaseContext dbContext,
+                                                     DatabaseHandler.DatabaseContext dbContext,
                                                      FleetController fleetController) throws InterruptedException {
         if ((clusterStateBundle == null) || currentClusterStateIsConverged()) {
             return; // Nothing to do for the current state
@@ -262,7 +260,7 @@ public class SystemStateBroadcaster {
         lastStateVersionBundleAcked = clusterStateBundle.getVersion();
     }
 
-    private void markCurrentClusterStateAsConverged(DatabaseHandler database, DatabaseContext dbContext, FleetController fleetController) {
+    private void markCurrentClusterStateAsConverged(DatabaseHandler database, DatabaseHandler.DatabaseContext dbContext, FleetController fleetController) {
         context.log(log, Level.FINE, "All distributors have newest clusterstate, updating start timestamps in zookeeper and clearing them from cluster state");
         lastClusterStateVersionConverged = clusterStateBundle.getVersion();
         lastClusterStateBundleConverged = clusterStateBundle;
@@ -281,8 +279,7 @@ public class SystemStateBroadcaster {
         lastOfficialStateVersion = clusterStateBundle.getVersion();
     }
 
-    public boolean broadcastNewStateBundleIfRequired(DatabaseContext dbContext,
-                                                     Communicator communicator,
+    public boolean broadcastNewStateBundleIfRequired(DatabaseHandler.DatabaseContext dbContext, Communicator communicator,
                                                      int lastClusterStateVersionWrittenToZooKeeper) {
         if (clusterStateBundle == null || clusterStateBundle.getVersion() == 0) {
             return false;
@@ -299,7 +296,7 @@ public class SystemStateBroadcaster {
         }
 
         List<NodeInfo> recipients = resolveStateVersionSendSet(dbContext);
-        var modifiedBundle = clusterStateBundle.cloneWithMapper(state -> buildModifiedClusterState(state, dbContext));
+        ClusterStateBundle modifiedBundle = clusterStateBundle.cloneWithMapper(state -> buildModifiedClusterState(state, dbContext));
         for (NodeInfo node : recipients) {
             if (nodeNeedsToObserveStartupTimestamps(node)) {
                 context.log(log,
@@ -320,9 +317,8 @@ public class SystemStateBroadcaster {
         return !recipients.isEmpty();
     }
 
-    public boolean broadcastStateActivationsIfRequired(DatabaseContext dbContext, Communicator communicator) {
-        int clusterStateBundleVersion = clusterStateBundle.getVersion();
-        if (clusterStateBundle == null || clusterStateBundleVersion == 0 || !currentBundleVersionIsTaggedOfficial()) {
+    public boolean broadcastStateActivationsIfRequired(DatabaseHandler.DatabaseContext dbContext, Communicator communicator) {
+        if (clusterStateBundle == null || clusterStateBundle.getVersion() == 0 || !currentBundleVersionIsTaggedOfficial()) {
             return false;
         }
 
@@ -335,8 +331,8 @@ public class SystemStateBroadcaster {
             context.log(log,
                         Level.FINE,
                         () -> "Sending cluster state activation to node " + node + " for version " +
-                                clusterStateBundleVersion);
-            communicator.activateClusterStateVersion(clusterStateBundleVersion, node, activateClusterStateVersionWaiter);
+                              clusterStateBundle.getVersion());
+            communicator.activateClusterStateVersion(clusterStateBundle.getVersion(), node, activateClusterStateVersionWaiter);
         }
 
         return !recipients.isEmpty();
@@ -352,7 +348,7 @@ public class SystemStateBroadcaster {
         return node.getStartTimestamp() != 0 && node.getWentDownWithStartTime() == node.getStartTimestamp();
     }
 
-    private static ClusterState buildModifiedClusterState(ClusterState sourceState, DatabaseContext dbContext) {
+    private static ClusterState buildModifiedClusterState(ClusterState sourceState, DatabaseHandler.DatabaseContext dbContext) {
         ClusterState newState = sourceState.clone();
         for (NodeInfo n : dbContext.getCluster().getNodeInfos()) {
             NodeState ns = newState.getNodeState(n.getNode());