Skip to content

[fix](catalog) remove backend in black list from candidate backends for external table (#38984) #39451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 1 commit into from
Aug 19, 2024
Merged

[fix](catalog) remove backend in black list from candidate backends for external table (#38984) #39451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/system/BeSelectionPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -209,6 +211,10 @@ public List<Backend> getCandidateBackends(Collection<Backend> backends) {
} 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;
}
Expand Down
2 changes: 2 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/system/SystemInfoServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
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;
Expand Down Expand Up @@ -133,6 +134,7 @@ public void testBackendHbResponseSerialization() throws IOException {

@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());
Expand Down