caiconghui commented on code in PR #16037:
URL: https://github.com/apache/doris/pull/16037#discussion_r1081090795
##########
fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java:
##########
@@ -1646,47 +1672,51 @@ public TScanRangeLocation
selectBackendsByRoundRobin(TScanRangeLocations seqLoca
}
try {
- return selectBackendsByRoundRobin(localLocations,
assignedBytesPerHost, backendIdRef);
+ return selectBackendsByRoundRobin(localLocations,
assignedBytesPerHost, replicaNumPerHost, backendIdRef);
} catch (UserException ue) {
if (!Config.enable_local_replica_selection_fallback) {
throw ue;
}
- return selectBackendsByRoundRobin(nonlocalLocations,
assignedBytesPerHost, backendIdRef);
+ return selectBackendsByRoundRobin(nonlocalLocations,
assignedBytesPerHost, replicaNumPerHost, backendIdRef);
}
}
public TScanRangeLocation
selectBackendsByRoundRobin(List<TScanRangeLocation> locations,
- HashMap<TNetworkAddress, Long> assignedBytesPerHost,
Reference<Long> backendIdRef) throws UserException {
+ Map<TNetworkAddress, Long> assignedBytesPerHost,
Map<TNetworkAddress, Long> replicaNumPerHost,
+ Reference<Long> backendIdRef) throws UserException {
Long minAssignedBytes = Long.MAX_VALUE;
+ Long minReplicaNum = Long.MAX_VALUE;
TScanRangeLocation minLocation = null;
Long step = 1L;
for (final TScanRangeLocation location : locations) {
Long assignedBytes = findOrInsert(assignedBytesPerHost,
location.server, 0L);
- if (assignedBytes < minAssignedBytes) {
+ if (assignedBytes < minAssignedBytes ||
(assignedBytes.equals(minAssignedBytes)
+ && replicaNumPerHost.get(location.server) <
minReplicaNum)) {
minAssignedBytes = assignedBytes;
+ minReplicaNum = replicaNumPerHost.get(location.server);
minLocation = location;
}
}
+ for (TScanRangeLocation location : locations) {
+ replicaNumPerHost.put(location.server,
replicaNumPerHost.get(location.server) - 1);
+ }
TScanRangeLocation location = SimpleScheduler.getLocation(minLocation,
locations,
this.idToBackend, backendIdRef);
- if (assignedBytesPerHost.containsKey(location.server)) {
- assignedBytesPerHost.put(location.server,
- assignedBytesPerHost.get(location.server) + step);
- } else {
- assignedBytesPerHost.put(location.server, step);
- }
+ assignedBytesPerHost.put(location.server,
assignedBytesPerHost.get(location.server) + step);
Review Comment:
findOrInsert(assignedBytesPerHost, location.server, 0L)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
