review improvements

Author: DiannaHohensee

server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/AllocationBalancingRoundSummaryService.java

@@ -43,7 +43,7 @@ public class AllocationBalancingRoundSummaryService {
         Setting.Property.Dynamic
     );
 
-    /** Controls how frequently in time balancer round summaries are logged. If less than zero, effectively disables reporting. */
+    /** Controls how frequently in time balancer round summaries are logged. */
     public static final Setting<TimeValue> BALANCER_ROUND_SUMMARIES_LOG_INTERVAL_SETTING = Setting.timeSetting(
         "cluster.routing.allocation.desired_balance.balanace_round_summaries_interval",
         TimeValue.timeValueSeconds(10),
@@ -61,10 +61,10 @@ public class AllocationBalancingRoundSummaryService {
      * A concurrency-safe list of balancing round summaries. Balancer rounds are run and added here serially, so the queue will naturally
      * progress from newer to older results.
      */
-    private ConcurrentLinkedQueue<BalancingRoundSummary> summaries = new ConcurrentLinkedQueue<>();
+    private final ConcurrentLinkedQueue<BalancingRoundSummary> summaries = new ConcurrentLinkedQueue<>();
 
     /** This reference is set when reporting is scheduled. If it is null, then reporting is inactive. */
-    private AtomicReference<Scheduler.Cancellable> scheduledReportFuture = new AtomicReference<>();
+    private final AtomicReference<Scheduler.Cancellable> scheduledReportFuture = new AtomicReference<>();
 
     public AllocationBalancingRoundSummaryService(ThreadPool threadPool, ClusterSettings clusterSettings) {
         this.threadPool = threadPool;

server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/AllocationBalancingRoundSummaryServiceTests.java

@@ -24,6 +24,8 @@
 public class AllocationBalancingRoundSummaryServiceTests extends ESTestCase {
     private static final Logger logger = LogManager.getLogger(AllocationBalancingRoundSummaryServiceTests.class);
 
+    private static final String BALANCING_SUMMARY_MSG_PREFIX = "Balancing round summaries:*";
+
     final Settings enabledSummariesSettings = Settings.builder()
         .put(AllocationBalancingRoundSummaryService.ENABLE_BALANCER_ROUND_SUMMARIES_SETTING.getKey(), true)
         .build();
@@ -73,10 +75,13 @@ public void testServiceDisabledByDefault() {
                     "Running balancer summary logging",
                     AllocationBalancingRoundSummaryService.class.getName(),
                     Level.INFO,
-                    "Balancing round summaries:*"
+                    "*"
                 )
             );
 
+            if (deterministicTaskQueue.hasDeferredTasks()) {
+                deterministicTaskQueue.advanceTime();
+            }
             deterministicTaskQueue.runAllRunnableTasks();
             mockLog.awaitAllExpectationsMatched();
             service.verifyNumberOfSummaries(0);
@@ -98,7 +103,7 @@ public void testEnabledService() {
                     "Running balancer summary logging",
                     AllocationBalancingRoundSummaryService.class.getName(),
                     Level.INFO,
-                    "Balancing round summaries:*"
+                    BALANCING_SUMMARY_MSG_PREFIX
                 )
             );
 
@@ -118,7 +123,7 @@ public void testEnabledService() {
                     "Running balancer summary logging a second time",
                     AllocationBalancingRoundSummaryService.class.getName(),
                     Level.INFO,
-                    "Balancing round summaries:*"
+                    BALANCING_SUMMARY_MSG_PREFIX
                 )
             );
 
@@ -173,7 +178,7 @@ public void testNoSummariesToReport() {
                     "Running balancer summary logging of combined summaries",
                     AllocationBalancingRoundSummaryService.class.getName(),
                     Level.INFO,
-                    "Balancing round summaries:*"
+                    BALANCING_SUMMARY_MSG_PREFIX
                 )
             );
 
@@ -191,7 +196,7 @@ public void testNoSummariesToReport() {
                     "No balancer round summary to log",
                     AllocationBalancingRoundSummaryService.class.getName(),
                     Level.INFO,
-                    "Balancing round summaries:*"
+                    "*"
                 )
             );
 
@@ -238,7 +243,7 @@ public void testEnableAndThenDisableService() {
                     "Running balancer summary logging",
                     AllocationBalancingRoundSummaryService.class.getName(),
                     Level.INFO,
-                    "Balancing round summaries:*"
+                    "*"
                 )
             );
             deterministicTaskQueue.advanceTime();