database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Doris On ES][Bug-Fix] ES queries always route at same 3 BE nodes (#4351) (#4352)

Browse Source 
resolve the problem of querying ES table always route at same 3 BE nodes because of random strategy
This commit is contained in:
caoyang10
2020-08-18 10:36:18 +08:00
committed by GitHub
parent d5e456a3c3
commit 53d00d92cc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fe/fe-core/src/main/java/org/apache/doris/planner/EsScanNode.java
View File

@ -204,13 +204,14 @@ public class EsScanNode extends ScanNode {
String.join(",", unPartitionedIndices),
String.join(",", partitionedIndices));
}
int beIndex = random.nextInt(backendList.size());
int size = backendList.size();
int beIndex = random.nextInt(size);
List<TScanRangeLocations> result = Lists.newArrayList();
for (EsShardPartitions indexState : selectedIndex) {
for (List<EsShardRouting> shardRouting : indexState.getShardRoutings().values()) {
// get backends
Set<Backend> colocatedBes = Sets.newHashSet();
int numBe = Math.min(3, backendMap.size());
int numBe = Math.min(3, size);
List<TNetworkAddress> shardAllocations = new ArrayList<>();
for (EsShardRouting item : shardRouting) {
shardAllocations.add(EsTable.TRANSPORT_HTTP.equals(table.getTransport()) ? item.getHttpAddress() : item.getAddress());
@ -224,7 +225,7 @@ public class EsScanNode extends ScanNode {
List<Backend> candidateBeList = Lists.newArrayList();
if (usingRandomBackend) {
for (int i = 0; i < numBe; ++i) {
candidateBeList.add(backendList.get(beIndex++ % numBe));
candidateBeList.add(backendList.get(beIndex++ % size));
}
} else {
candidateBeList.addAll(colocatedBes);