[fix][broker] Fixed ServiceUnitStateChannel monitor to tombstone only…

… inactive bundle states (apache#21721) (cherry picked from commit 8d16580) (cherry picked from commit 30fe564)
datastax · Jan 8, 2024 · 4b7f34b · 4b7f34b
1 parent c2d3d37
commit 4b7f34b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.../org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java b/.../org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
@@ -1412,7 +1412,7 @@ protected void monitorOwnerships(List<String> brokers) {
                 continue;
             }
 
-            if (now - stateData.timestamp() > semiTerminalStateWaitingTimeInMillis) {
+            if (!isActiveState(state) && now - stateData.timestamp() > semiTerminalStateWaitingTimeInMillis) {
                 log.info("Found semi-terminal states to tombstone"
                         + " serviceUnit:{}, stateData:{}", serviceUnit, stateData);
                 tombstoneAsync(serviceUnit).whenComplete((__, e) -> {

diff --git a/.../org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java b/.../org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java
@@ -636,7 +636,7 @@ public void splitAndRetryTest() throws Exception {
         var leader = channel1.isChannelOwnerAsync().get() ? channel1 : channel2;
         validateMonitorCounters(leader,
                 0,
-                3,
+                1,
                 0,
                 0,
                 0,
@@ -1406,7 +1406,7 @@ public void splitAndRetryFailureTest() throws Exception {
 
         validateMonitorCounters(leader,
                 0,
-                3,
+                1,
                 1,
                 0,
                 0,
-Original file line number
+Diff line change
@@ Expand Up / @@ -636,7 +636,7 @@ public void splitAndRetryTest() throws Exception { @@
             var leader = channel1.isChannelOwnerAsync().get() ? channel1 : channel2;
             validateMonitorCounters(leader,
 ,
-,
+,
 ,
 ,
 ,
@@ Expand Down Expand Up / @@ -1406,7 +1406,7 @@ public void splitAndRetryFailureTest() throws Exception { @@
             validateMonitorCounters(leader,
 ,
-,
+,
 ,
 ,
 ,
@@ Expand Down @@