branch-3.0: [fix](bdbje) avoid remove empty frontends #46424 (#50472)

github-actions[bot] · dataroaring · web-flow · commit 7167b16b8726 · 2025-04-28T19:42:22.000+08:00
Cherry-picked from #46424 Co-authored-by: Yongqiang YANG <yangyongqiang@selectdb.com>
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -3172,6 +3172,9 @@ public void dropFrontendFromBDBJE(FrontendNodeType role, String host, int port)
     }
 
     private void removeDroppedFrontends(ConcurrentLinkedQueue<String> removedFrontends) {
+        if (removedFrontends.size() == 0) {
+            return;
+        }
         if (!Strings.isNullOrEmpty(System.getProperty(FeConstants.METADATA_FAILURE_RECOVERY_KEY))) {
             // metadata recovery mode
             LOG.info("Metadata failure recovery({}), ignore removing dropped frontends",
@@ -3181,6 +3184,7 @@ private void removeDroppedFrontends(ConcurrentLinkedQueue<String> removedFronten
 
         if (haProtocol != null && haProtocol instanceof BDBHA) {
             BDBHA bdbha = (BDBHA) haProtocol;
+            LOG.info("remove frontends, num {} frontends {}", removedFrontends.size(), removedFrontends);
             bdbha.removeDroppedMember(removedFrontends);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -3172,6 +3172,9 @@ public void dropFrontendFromBDBJE(FrontendNodeType role, String host, int port)`
`3172`	`3172`	`}`
`3173`	`3173`
`3174`	`3174`	`private void removeDroppedFrontends(ConcurrentLinkedQueue<String> removedFrontends) {`
	`3175`	`+ if (removedFrontends.size() == 0) {`
	`3176`	`+ return;`
	`3177`	`+ }`
`3175`	`3178`	`if (!Strings.isNullOrEmpty(System.getProperty(FeConstants.METADATA_FAILURE_RECOVERY_KEY))) {`
`3176`	`3179`	`// metadata recovery mode`
`3177`	`3180`	`LOG.info("Metadata failure recovery({}), ignore removing dropped frontends",`
`@@ -3181,6 +3184,7 @@ private void removeDroppedFrontends(ConcurrentLinkedQueue<String> removedFronten`
`3181`	`3184`
`3182`	`3185`	`if (haProtocol != null && haProtocol instanceof BDBHA) {`
`3183`	`3186`	`BDBHA bdbha = (BDBHA) haProtocol;`
	`3187`	`+ LOG.info("remove frontends, num {} frontends {}", removedFrontends.size(), removedFrontends);`
`3184`	`3188`	`bdbha.removeDroppedMember(removedFrontends);`
`3185`	`3189`	`}`
`3186`	`3190`	`}`