Skip to content

[fix](cloud) Fix the error of Cloud forwarding SQL not finding the cluster #41819

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
dataroaring merged 1 commit into from
Oct 15, 2024
Merged

[fix](cloud) Fix the error of Cloud forwarding SQL not finding the cluster #41819

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
8 changes: 4 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/TabletInvertedIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,17 +630,17 @@ public void deleteTablet(long tabletId) {
public void addReplica(long tabletId, Replica replica) {
long stamp = writeLock();
try {
Preconditions.checkState(tabletMetaMap.containsKey(tabletId),
"tablet " + tabletId + " not exists, replica " + replica.getId()
+ ", backend " + replica.getBackendIdWithoutException());
// cloud mode, create table not need backendId, represent with -1.
long backendId = Config.isCloudMode() ? -1 : replica.getBackendIdWithoutException();
Preconditions.checkState(tabletMetaMap.containsKey(tabletId),
"tablet " + tabletId + " not exists, replica " + replica.getId()
+ ", backend " + backendId);
replicaMetaTable.put(tabletId, backendId, replica);
replicaToTabletMap.put(replica.getId(), tabletId);
backingReplicaMetaTable.put(backendId, tabletId, replica);
if (LOG.isDebugEnabled()) {
LOG.debug("add replica {} of tablet {} in backend {}",
replica.getId(), tabletId, replica.getBackendIdWithoutException());
replica.getId(), tabletId, backendId);
}
} finally {
writeUnlock(stamp);
Expand Down
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;

import java.util.Arrays;
import java.util.List;

/*
Expand Down Expand Up @@ -116,7 +116,7 @@ public ProcResult fetchResult() throws AnalysisException {
if (Config.enable_query_hit_stats) {
queryHits = QueryStatsUtil.getMergedReplicaStats(replica.getId());
}
List<String> replicaInfo = Arrays.asList(String.valueOf(replica.getId()),
List<String> replicaInfo = Lists.newArrayList(String.valueOf(replica.getId()),
String.valueOf(replica.getBackendIdWithoutException()),
String.valueOf(replica.getVersion()),
String.valueOf(replica.getLastSuccessVersion()),
Expand Down
1 change: 0 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ private TMasterOpRequest buildStmtForwardParams() throws AnalysisException {
cluster = ctx.getCloudCluster(false);
} catch (Exception e) {
LOG.warn("failed to get cloud compute group", e);
throw new AnalysisException("failed to get cloud compute group", e);
}
if (!Strings.isNullOrEmpty(cluster)) {
params.setCloudCluster(cluster);
Expand Down