This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 843afccdf90 [fix](catalog) remove backend in black list from candidate
backends for external table (#38984)
843afccdf90 is described below
commit 843afccdf9097ff628e82007cb1fce99dc6ac61e
Author: Mingyu Chen <[email protected]>
AuthorDate: Wed Aug 7 14:09:06 2024 +0800
[fix](catalog) remove backend in black list from candidate backends for
external table (#38984)
When select backends for external table's query,
skip the backends in black list
---
.../src/main/java/org/apache/doris/system/BeSelectionPolicy.java | 6 ++++++
.../test/java/org/apache/doris/system/SystemInfoServiceTest.java | 2 ++
2 files changed, 8 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
b/fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
index 8c7c1d816a8..8c823eb75ee 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
@@ -17,6 +17,8 @@
package org.apache.doris.system;
+import org.apache.doris.common.Config;
+import org.apache.doris.qe.SimpleScheduler;
import org.apache.doris.resource.Tag;
import org.apache.doris.thrift.TStorageMedium;
@@ -209,6 +211,10 @@ public class BeSelectionPolicy {
} else {
candidates.addAll(filterBackends);
}
+ // filter out backends in black list
+ if (!Config.disable_backend_black_list) {
+ candidates = candidates.stream().filter(b ->
SimpleScheduler.isAvailable(b)).collect(Collectors.toList());
+ }
Collections.shuffle(candidates);
return candidates;
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/system/SystemInfoServiceTest.java
b/fe/fe-core/src/test/java/org/apache/doris/system/SystemInfoServiceTest.java
index eb1f33c2889..d14cdd2a865 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/system/SystemInfoServiceTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/system/SystemInfoServiceTest.java
@@ -21,6 +21,7 @@ import org.apache.doris.catalog.DiskInfo;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.ReplicaAllocation;
import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
import org.apache.doris.common.FeMetaVersion;
import org.apache.doris.common.Pair;
import org.apache.doris.meta.MetaContext;
@@ -133,6 +134,7 @@ public class SystemInfoServiceTest {
@Test
public void testSelectBackendIdsByPolicy() throws Exception {
+ Config.disable_backend_black_list = true;
// 1. no backend
BeSelectionPolicy policy = new
BeSelectionPolicy.Builder().needLoadAvailable().build();
Assert.assertEquals(0, infoService.selectBackendIdsByPolicy(policy,
1).size());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
