(pulsar) branch master updated: [cleanup][broker] Remove warn logs when changing the state from Owned to Free (Extensible LB) (#22708)

[xyz]

This is an automated email from the ASF dual-hosted git repository.

xyz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 22a9023acd2 [cleanup][broker] Remove warn logs when changing the state 
from Owned to Free (Extensible LB) (#22708)
22a9023acd2 is described below

commit 22a9023acd231efea34e4f2cd7389b89eaec5435
Author: Yunze Xu <xyzinfern...@163.com>
AuthorDate: Wed May 15 12:57:17 2024 +0800

    [cleanup][broker] Remove warn logs when changing the state from Owned to 
Free (Extensible LB) (#22708)
---
 .../channel/ServiceUnitStateChannelImpl.java       | 36 ++++++----------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
index bf6266482f8..9821ce56420 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
@@ -1284,34 +1284,16 @@ public class ServiceUnitStateChannelImpl implements 
ServiceUnitStateChannel {
     }
 
 
-    private ServiceUnitStateData 
getOverrideInactiveBrokerStateData(ServiceUnitStateData orphanData,
-                                                                    
Optional<String> selectedBroker,
-                                                                    String 
inactiveBroker) {
-
-
-        if (selectedBroker.isEmpty()) {
-            return new ServiceUnitStateData(Free, null, inactiveBroker,
-                    true, getNextVersionId(orphanData));
-        }
-
-        if (orphanData.state() == Splitting) {
-            return new ServiceUnitStateData(Splitting, orphanData.dstBroker(), 
selectedBroker.get(),
-                    Map.copyOf(orphanData.splitServiceUnitToDestBroker()),
-                    true, getNextVersionId(orphanData));
-        } else {
-            return new ServiceUnitStateData(Owned, selectedBroker.get(), 
inactiveBroker,
-                    true, getNextVersionId(orphanData));
-        }
-    }
-
     private void overrideOwnership(String serviceUnit, ServiceUnitStateData 
orphanData, String inactiveBroker) {
-        Optional<String> selectedBroker = selectBroker(serviceUnit, 
inactiveBroker);
-        if (selectedBroker.isEmpty()) {
-            log.warn("Empty selected broker for ownership serviceUnit:{} 
orphanData:{}."
-                            + "totalCleanupErrorCnt:{}",
-                    serviceUnit, orphanData, 
totalCleanupErrorCnt.incrementAndGet());
-        }
-        var override = getOverrideInactiveBrokerStateData(orphanData, 
selectedBroker, inactiveBroker);
+        final var version = getNextVersionId(orphanData);
+        final var override = selectBroker(serviceUnit, 
inactiveBroker).map(selectedBroker -> {
+            if (orphanData.state() == Splitting) {
+                return new ServiceUnitStateData(Splitting, 
orphanData.dstBroker(), selectedBroker,
+                        Map.copyOf(orphanData.splitServiceUnitToDestBroker()), 
true, version);
+            } else {
+                return new ServiceUnitStateData(Owned, selectedBroker, 
inactiveBroker, true, version);
+            }
+        }).orElseGet(() -> new ServiceUnitStateData(Free, null, 
inactiveBroker, true, version));
         log.info("Overriding ownership serviceUnit:{} from orphanData:{} to 
overrideData:{}",
                 serviceUnit, orphanData, override);
         publishOverrideEventAsync(serviceUnit, orphanData, override)