Rename ClusterStateChangeTracker -> ClusterStatsChangeTracker.

3 files changed, 22 insertions, 22 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateChangeTracker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsChangeTracker.java
index 839d9c7357f..3ed6fc332ed 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateChangeTracker.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsChangeTracker.java
@@ -4,15 +4,15 @@ package com.yahoo.vespa.clustercontroller.core;
 /**
  * Class tracking whether we have changes in current and previous cluster stats.
  *
- * The state is considered changed if the current and previous cluster stats differs in whether
+ * The cluster stats are considered changed if the current and previous stats differs in whether
  * they may have buckets pending in the 'global' bucket space. This signals that the ClusterStateBundle should be recomputed.
  */
-public class ClusterStateChangeTracker {
+public class ClusterStatsChangeTracker {
 
     private ClusterStatsAggregator aggregator;
     private boolean prevMayHaveBucketsPending;
 
-    public ClusterStateChangeTracker(ClusterStatsAggregator aggregator) {
+    public ClusterStatsChangeTracker(ClusterStatsAggregator aggregator) {
         this.aggregator = aggregator;
         this.prevMayHaveBucketsPending = false;
     }
@@ -26,7 +26,7 @@ public class ClusterStateChangeTracker {
         aggregator = newAggregator;
     }
 
-    public boolean stateHasChanged() {
+    public boolean statsHaveChanged() {
         if (!aggregator.hasUpdatesFromAllDistributors()) {
             return false;
         }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateVersionTracker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateVersionTracker.java
index 511f1707389..7232b2f9346 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateVersionTracker.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateVersionTracker.java
@@ -32,14 +32,14 @@ public class StateVersionTracker {
     private ClusterStateBundle currentClusterState = latestCandidateState;
 
     private ClusterStateView clusterStateView;
-    private ClusterStateChangeTracker clusterStateChangeTracker;
+    private ClusterStatsChangeTracker clusterStatsChangeTracker;
 
     private final LinkedList<ClusterStateHistoryEntry> clusterStateHistory = new LinkedList<>();
     private int maxHistoryEntryCount = 50;
 
     StateVersionTracker() {
         clusterStateView = ClusterStateView.create(currentUnversionedState.getBaselineClusterState());
-        clusterStateChangeTracker = new ClusterStateChangeTracker(clusterStateView.getStatsAggregator());
+        clusterStatsChangeTracker = new ClusterStatsChangeTracker(clusterStateView.getStatsAggregator());
     }
 
     void setVersionRetrievedFromZooKeeper(final int version) {
@@ -85,7 +85,7 @@ public class StateVersionTracker {
     public void updateLatestCandidateStateBundle(final ClusterStateBundle candidateBundle) {
         assert(latestCandidateState.getBaselineClusterState().getVersion() == 0);
         latestCandidateState = candidateBundle;
-        clusterStateChangeTracker.syncBucketsPendingFlag();
+        clusterStatsChangeTracker.syncBucketsPendingFlag();
     }
 
     /**
@@ -124,7 +124,7 @@ public class StateVersionTracker {
                 newStateBundle.getBaselineClusterState().getDistributionBitCount());
         // TODO should this take place in updateLatestCandidateStateBundle instead? I.e. does it require a consolidated state?
         clusterStateView = ClusterStateView.create(currentClusterState.getBaselineClusterState());
-        clusterStateChangeTracker.updateAggregator(clusterStateView.getStatsAggregator());
+        clusterStatsChangeTracker.updateAggregator(clusterStateView.getStatsAggregator());
     }
 
     private void recordCurrentStateInHistoryAtTime(final long currentTimeMs) {
@@ -141,7 +141,7 @@ public class StateVersionTracker {
     }
 
     boolean bucketSpaceMergeCompletionStateHasChanged() {
-        return clusterStateChangeTracker.stateHasChanged();
+        return clusterStatsChangeTracker.statsHaveChanged();
     }
 
     /*
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateChangeTrackerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsChangeTrackerTest.java
index b15ba035fe1..8670c512f14 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateChangeTrackerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsChangeTrackerTest.java
@@ -7,15 +7,15 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class ClusterStateChangeTrackerTest {
+public class ClusterStatsChangeTrackerTest {
 
     private static class Fixture {
         private ClusterStatsAggregator aggregator;
-        private ClusterStateChangeTracker state;
+        private ClusterStatsChangeTracker tracker;
 
         public Fixture() {
             aggregator = new ClusterStatsAggregator(Sets.newHashSet(1), Sets.newHashSet(2));
-            state = new ClusterStateChangeTracker(aggregator);
+            tracker = new ClusterStatsChangeTracker(aggregator);
         }
 
         public void setBucketsPendingStats() {
@@ -33,36 +33,36 @@ public class ClusterStateChangeTrackerTest {
 
         public void updateAggregator() {
             aggregator = new ClusterStatsAggregator(Sets.newHashSet(1), Sets.newHashSet(2));
-            state.updateAggregator(aggregator);
+            tracker.updateAggregator(aggregator);
         }
 
-        public boolean stateHasChanged() {
-            return state.stateHasChanged();
+        public boolean statsHaveChanged() {
+            return tracker.statsHaveChanged();
         }
 
     }
 
     @Test
-    public void state_has_not_changed_if_not_all_distributors_are_updated() {
+    public void stats_have_not_changed_if_not_all_distributors_are_updated() {
         Fixture f = new Fixture();
-        assertFalse(f.stateHasChanged());
+        assertFalse(f.statsHaveChanged());
     }
 
     @Test
-    public void state_has_changed_if_previous_buckets_pending_stats_are_different_from_current() {
+    public void stats_have_changed_if_previous_buckets_pending_stats_are_different_from_current() {
         Fixture f = new Fixture();
 
         f.setInSyncStats();
-        assertFalse(f.stateHasChanged());
+        assertFalse(f.statsHaveChanged());
         f.setBucketsPendingStats();
-        assertTrue(f.stateHasChanged());
+        assertTrue(f.statsHaveChanged());
 
         f.updateAggregator(); // previous stats may now have buckets pending
 
         f.setInSyncStats();
-        assertTrue(f.stateHasChanged());
+        assertTrue(f.statsHaveChanged());
         f.setBucketsPendingStats();
-        assertFalse(f.stateHasChanged());
+        assertFalse(f.statsHaveChanged());
     }
 
 }