Skip to content

Commit c2aaed9

Browse files
morrySnowenglefly
andauthored
branch-4.2: [fix](scan) Use query-available check for scan replica selection #66964 (#70025)
picked from master #66964 Co-authored-by: minghong <[email protected]>
1 parent 3f29ad8 commit c2aaed9

4 files changed

Lines changed: 83 additions & 8 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/distribute/worker/LoadBalanceScanWorkerSelector.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@ private WorkerScanRanges selectScanReplicaAndMinWorkloadWorker(
263263
if (replicaLocations.size() == 1) {
264264
TScanRangeLocation replicaLocation = replicaLocations.get(0);
265265
DistributedPlanWorker worker = workerManager.getWorker(catalogId, replicaLocation.getBackendId());
266+
if (!((BackendWorker) worker).getBackend().isQueryAvailable()) {
267+
throw new AnalysisException("No available workers");
268+
}
266269
ScanRanges scanRanges = new ScanRanges();
267270
TScanRangeParams scanReplicaParams =
268271
ScanWorkerSelector.buildScanReplicaParams(tabletLocation, replicaLocation);
@@ -302,7 +305,7 @@ private WorkerScanRanges selectMinWorkloadWorkerInTier(TScanRangeLocations table
302305

303306
for (TScanRangeLocation replicaLocation : replicaLocations) {
304307
DistributedPlanWorker worker = workerManager.getWorker(catalogId, replicaLocation.getBackendId());
305-
if (!worker.available()) {
308+
if (!((BackendWorker) worker).getBackend().isQueryAvailable()) {
306309
continue;
307310
}
308311

‎fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,9 @@ private void addScanRangeLocations(Partition partition,
635635
}
636636
Backend backend = allBackends.get(beId);
637637
// If the fixed replica is bad, then not clear the replicas using random replica
638-
if (backend == null || !backend.isAlive()) {
638+
if (backend == null || !backend.isQueryAvailable()) {
639639
if (LOG.isDebugEnabled()) {
640-
LOG.debug("backend {} not exists or is not alive for replica {}", beId,
640+
LOG.debug("backend {} not exists or is not query available for replica {}", beId,
641641
replica.getId());
642642
}
643643
Collections.shuffle(replicas);
@@ -666,7 +666,7 @@ private void addScanRangeLocations(Partition partition,
666666
if (replicaOptional.isPresent()) {
667667
Replica replica = replicaOptional.get();
668668
Backend backend = allBackends.get(replica.getBackendIdWithoutException());
669-
if (backend != null && backend.isAlive()) {
669+
if (backend != null && backend.isQueryAvailable()) {
670670
replicas.clear();
671671
replicas.add(replica);
672672
}
@@ -701,14 +701,14 @@ private void addScanRangeLocations(Partition partition,
701701
clusterException = true;
702702
continue;
703703
}
704-
if (backend == null || !backend.isAlive()) {
704+
if (backend == null || !backend.isQueryAvailable()) {
705705
if (LOG.isDebugEnabled()) {
706-
LOG.debug("backend {} not exists or is not alive for replica {}", backendId,
706+
LOG.debug("backend {} not exists or is not query available for replica {}", backendId,
707707
replica.getId());
708708
}
709709
String err = "replica " + replica.getId() + "'s backend " + backendId
710710
+ (backend != null ? " with tag " + backend.getLocationTag() : "")
711-
+ " does not exist or not alive";
711+
+ " does not exist or is not query available";
712712
errs.add(err);
713713
continue;
714714
}

‎fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/distribute/worker/LoadBalanceScanWorkerSelectorBackendSelectionTest.java‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.doris.common.NereidsException;
2323
import org.apache.doris.common.UserException;
2424
import org.apache.doris.datasource.InternalCatalog;
25+
import org.apache.doris.nereids.exceptions.AnalysisException;
2526
import org.apache.doris.qe.ConnectContext;
2627
import org.apache.doris.resource.BackendSelection;
2728
import org.apache.doris.resource.BackendSelectionManager;
@@ -178,13 +179,36 @@ void testQuerySelectionFallsBackWhenPreferredWorkersAreUnavailable() throws Exce
178179
}
179180

180181
@Test
181-
void testSingleReplicaSelectionPreservesUnavailableWorkerBehavior() throws Exception {
182+
void testSingleReplicaSelectionRejectsUnavailableWorker() {
182183
Backend unavailable = backend(1L, "preferred");
183184
unavailable.setAlive(false);
184185
DistributedPlanWorkerManager workerManager = workerManager(unavailable);
185186
LoadBalanceScanWorkerSelector selector = new LoadBalanceScanWorkerSelector(
186187
workerManager, new ConnectContext(), false);
187188

189+
Assertions.assertThrows(AnalysisException.class,
190+
() -> select(selector, locations(location(1L)), 100L));
191+
}
192+
193+
@Test
194+
void testSingleReplicaSelectionRejectsQueryDisabledWorker() {
195+
Backend queryDisabled = backend(1L, "preferred");
196+
queryDisabled.setQueryDisabled(true);
197+
DistributedPlanWorkerManager workerManager = workerManager(queryDisabled);
198+
LoadBalanceScanWorkerSelector selector = new LoadBalanceScanWorkerSelector(
199+
workerManager, new ConnectContext(), false);
200+
201+
Assertions.assertThrows(AnalysisException.class,
202+
() -> select(selector, locations(location(1L)), 100L));
203+
}
204+
205+
@Test
206+
void testSingleReplicaSelectionKeepsAvailableWorker() throws Exception {
207+
Backend available = backend(1L, "preferred");
208+
DistributedPlanWorkerManager workerManager = workerManager(available);
209+
LoadBalanceScanWorkerSelector selector = new LoadBalanceScanWorkerSelector(
210+
workerManager, new ConnectContext(), false);
211+
188212
WorkerScanRanges selected = select(selector, locations(location(1L)), 100L);
189213

190214
Assertions.assertEquals(1L, selected.worker.id());

‎fe/fe-core/src/test/java/org/apache/doris/planner/OlapScanNodeBackendSelectionConfigTest.java‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,54 @@ void testCooldownReplicaAffinityOverridesQueryAffinityOnlyWhenEnabled() throws E
288288
}
289289
}
290290

291+
@Test
292+
void testQueryDisabledBackendExcludedFromScanCandidates() throws Exception {
293+
Replica replica = replica(1, 10);
294+
Backend disabledBackend = backend(1, "group_a");
295+
disabledBackend.setQueryDisabled(true);
296+
Backend otherBackend = backend(2, "group_b");
297+
298+
Tablet tablet = Mockito.mock(Tablet.class);
299+
Mockito.when(tablet.getId()).thenReturn(20L);
300+
Mockito.when(tablet.getQueryableReplicas(
301+
Mockito.eq(10L), Mockito.anyMap(), Mockito.eq(false)))
302+
.thenReturn(new ArrayList<>(ImmutableList.of(replica)));
303+
Mockito.when(tablet.getCooldownReplicaId()).thenReturn(-1L);
304+
305+
UserException ex = Assertions.assertThrows(UserException.class,
306+
() -> createScanRanges(tablet, disabledBackend, otherBackend));
307+
Assertions.assertTrue(ex.getMessage().contains("has no queryable replicas"));
308+
}
309+
310+
@Test
311+
void testCooldownReplicaOnQueryDisabledBackendIsNotNarrowed() throws Exception {
312+
Replica preferredReplica = replica(1, 10);
313+
Replica cooldownReplica = replica(2, 10);
314+
Backend preferredBackend = backend(1, "group_a");
315+
Backend cooldownBackend = backend(2, "group_b");
316+
cooldownBackend.setQueryDisabled(true);
317+
318+
SessionVariable sessionVariable = new SessionVariable();
319+
sessionVariable.enableCooldownReplicaAffinity = true;
320+
ConnectContext context = Mockito.mock(ConnectContext.class);
321+
QueryState queryState = Mockito.mock(QueryState.class);
322+
Mockito.when(context.getSessionVariable()).thenReturn(sessionVariable);
323+
Mockito.when(context.getState()).thenReturn(queryState);
324+
Mockito.when(context.getStatementContext()).thenReturn(new StatementContext());
325+
Mockito.when(context.getComputeGroupSafely()).thenReturn(null);
326+
327+
try (MockedStatic<ConnectContext> mockedContext = Mockito.mockStatic(ConnectContext.class)) {
328+
mockedContext.when(ConnectContext::get).thenReturn(context);
329+
330+
List<TScanRangeLocations> scanRanges = createScanRanges(
331+
preferredReplica, cooldownReplica, preferredBackend, cooldownBackend);
332+
333+
Assertions.assertEquals(ImmutableList.of(1L),
334+
scanRanges.get(0).getLocations().stream()
335+
.map(location -> location.getBackendId()).collect(Collectors.toList()));
336+
}
337+
}
338+
291339
private List<TScanRangeLocations> createScanRanges(Replica preferredReplica, Replica cooldownReplica,
292340
Backend preferredBackend, Backend cooldownBackend) throws Exception {
293341
Tablet tablet = Mockito.mock(Tablet.class);

0 commit comments

Comments
 (0)