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

… inactive bundle states (apache#21721)
streamnative · Dec 14, 2023 · 8d16580 · 8d16580
1 parent 9b043c6
commit 8d16580
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
@@ -1446,7 +1446,7 @@ protected void monitorOwnerships(List<String> brokers) {
                 continue;
             }
 
-            if (now - stateData.timestamp() > stateTombstoneDelayTimeInMillis) {
+            if (!isActiveState(state) && now - stateData.timestamp() > stateTombstoneDelayTimeInMillis) {
                 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
@@ -639,7 +639,7 @@ public void splitAndRetryTest() throws Exception {
         var leader = channel1.isChannelOwnerAsync().get() ? channel1 : channel2;
         validateMonitorCounters(leader,
                 0,
-                3,
+                1,
                 0,
                 0,
                 0,
@@ -1409,7 +1409,7 @@ public void splitAndRetryFailureTest() throws Exception {
 
         validateMonitorCounters(leader,
                 0,
-                3,
+                1,
                 1,
                 0,
                 0,
-Original file line number
+Diff line change
@@ Expand Up / @@ -639,7 +639,7 @@ public void splitAndRetryTest() throws Exception { @@
             var leader = channel1.isChannelOwnerAsync().get() ? channel1 : channel2;
             validateMonitorCounters(leader,
 ,
-,
+,
 ,
 ,
 ,
@@ Expand Down Expand Up / @@ -1409,7 +1409,7 @@ public void splitAndRetryFailureTest() throws Exception { @@
             validateMonitorCounters(leader,
 ,
-,
+,
 ,
 ,
 ,
@@ Expand Down @@