Skip to content

[fix](catalog) fix wrong issue of getBackendMeta #59191

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
Dec 22, 2025
Merged

[fix](catalog) fix wrong issue of getBackendMeta #59191

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
68 changes: 2 additions & 66 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/doris/FeServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public class FeServiceClient {
private final Random random = new Random(System.currentTimeMillis());
private final String name;
private final List<TNetworkAddress> addresses;
private volatile TNetworkAddress master;
private final String user;
private final String password;
private final int retryCount;
Expand Down Expand Up @@ -118,79 +117,16 @@ private <T> T randomCallWithRetry(ThriftCall<T> call, String errorMsg, int timeo
throw new RuntimeException(errorMsg + ":" + lastException.getMessage(), lastException);
}

private <T> T callFromMaster(ThriftCall<MasterResult<T>> call, String errorMsg, int timeout) {
TNetworkAddress address = master;
FrontendService.Client client = null;
Exception lastException = null;
if (address != null) {
client = getRemoteFeClient(address, timeout);
boolean returnObj = false;
try {
MasterResult<T> ret = call.call(client);
returnObj = true;
if (ret.isMaster) {
if (ret.hasError) {
throw new RuntimeException(ret.errorMsg);
}
return ret.result;
}
} catch (TException | IOException e) {
lastException = e;
} catch (Exception e) {
throw new RuntimeException(errorMsg + ":" + e.getMessage(), e);
} finally {
returnClient(address, client, returnObj);
}
}
master = null;
List<TNetworkAddress> addresses = getAddresses();
int retries = 0;
while (retries < retryCount) {
int index = random.nextInt(addresses.size());
for (int i = 0; i < addresses.size() && retries < retryCount; i++) {
address = addresses.get((index + i) % addresses.size());
client = getRemoteFeClient(address, timeout);
boolean returnObj = false;
try {
MasterResult<T> ret = call.call(client);
returnObj = true;
if (ret.isMaster) {
master = address;
if (ret.hasError) {
throw new RuntimeException(ret.errorMsg);
}
return ret.result;
}
} catch (TException | IOException e) {
lastException = e;
retries++;
} catch (Exception e) {
throw new RuntimeException(errorMsg + ":" + e.getMessage(), e);
} finally {
returnClient(address, client, returnObj);
}
}
}
throw new RuntimeException(errorMsg + ":" + lastException.getMessage(), lastException);
}

public List<Backend> listBackends() {
TGetBackendMetaRequest request = new TGetBackendMetaRequest();
request.setUser(user);
request.setPasswd(password);
String msg = String.format("failed to get backends from remote doris:%s", name);
return callFromMaster(client -> {
return randomCallWithRetry(client -> {
TGetBackendMetaResult result = client.getBackendMeta(request);
if (result.getStatus().getStatusCode() == TStatusCode.NOT_MASTER) {
return MasterResult.notMaster();
}
if (result.getStatus().getStatusCode() != TStatusCode.OK) {
return MasterResult.masterWithError(result.getStatus().toString());
}
List<Backend> backends = result.getBackends().stream()
return result.getBackends().stream()
.map(b -> Backend.fromThrift(b))
.collect(Collectors.toList());
return MasterResult.withResult(backends);
}, msg, timeout);
}

Expand Down
6 changes: 1 addition & 5 deletions fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4179,13 +4179,9 @@ public TGetBackendMetaResult getBackendMeta(TGetBackendMetaRequest request) {
}

TGetBackendMetaResult result = new TGetBackendMetaResult();
TStatus status = checkMaster();
TStatus status = new TStatus(TStatusCode.OK);
result.setStatus(status);

if (status.getStatusCode() != TStatusCode.OK) {
return result;
}

try {
result = getBackendMetaImpl(request, clientAddr);
} catch (UserException e) {
Expand Down
Loading