fix test

ywangd · Nov 25, 2024 · b5b7b5a · b5b7b5a
1 parent 0fc0e42
commit b5b7b5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocator.java b/...org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocator.java
@@ -237,7 +237,9 @@ public void allocate(RoutingAllocation allocation, ActionListener<Void> listener
         logger.debug("Executing allocate for [{}]", index);
         queue.add(index, listener);
         // This can only run on master, so unset not-master if exists
-        currentDesiredBalanceRef.compareAndSet(DesiredBalance.NOT_MASTER, DesiredBalance.INITIAL);
+        if (currentDesiredBalanceRef.compareAndSet(DesiredBalance.NOT_MASTER, DesiredBalance.INITIAL)) {
+            logger.debug("initialized desired balance for becoming master");
+        }
         desiredBalanceComputation.onNewInput(DesiredBalanceInput.create(index, allocation));
 
         if (allocation.routingTable().indicesRouting().isEmpty()) {

diff --git a/...lasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocatorTests.java b/...lasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocatorTests.java
@@ -968,7 +968,7 @@ protected void submitReconcileTask(DesiredBalance desiredBalance) {
                 lastListener.onResponse(null);
             }
         };
-        assertThat(desiredBalanceShardsAllocator.getDesiredBalance(), sameInstance(DesiredBalance.INITIAL));
+        assertThat(desiredBalanceShardsAllocator.getDesiredBalance(), sameInstance(DesiredBalance.NOT_MASTER));
         try {
             final PlainActionFuture<Void> future = new PlainActionFuture<>();
             desiredBalanceShardsAllocator.allocate(