Skip to content

[fix](process list) return unexpected result in FULL mode #64631

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
morrySnow merged 1 commit into from
Jun 22, 2026
+7 −11
Merged

[fix](process list) return unexpected result in FULL mode #64631

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
16 changes: 6 additions & 10 deletions fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,10 @@ public static List<Pair<String, Integer>> getFrontendWithRpcPort(Env env, boolea
List<Pair<String, Integer>> allFe = new ArrayList<>();
List<Frontend> frontends = env.getFrontends(null);

String selfNode = Env.getCurrentEnv().getSelfNode().getHost();
if (ConnectContext.get() != null && !Strings.isNullOrEmpty(ConnectContext.get().getCurrentConnectedFEIp())) {
selfNode = ConnectContext.get().getCurrentConnectedFEIp();
}
String selfNodeName = env.getNodeName();

String finalSelfNode = selfNode;
frontends.stream()
.filter(fe -> (!fe.getHost().equals(finalSelfNode) || includeSelf))
.filter(fe -> (!fe.getNodeName().equals(selfNodeName) || includeSelf))
.map(fe -> Pair.of(fe.getHost(), fe.getRpcPort()))
.forEach(allFe::add);
return allFe;
Expand Down Expand Up @@ -129,7 +125,7 @@ public static void getFrontendsInfo(Env env, List<List<String>> infos, String cu
info.add(Integer.toString(fe.getEditLogPort()));
info.add(Integer.toString(Config.http_port));

if (fe.getHost().equals(env.getSelfNode().getHost())) {
if (fe.getNodeName().equals(env.getNodeName())) {
info.add(Integer.toString(Config.query_port));
info.add(Integer.toString(Config.rpc_port));
info.add(Integer.toString(Config.arrow_flight_sql_port));
Expand All @@ -144,15 +140,15 @@ public static void getFrontendsInfo(Env env, List<List<String>> infos, String cu
//An ipv6 address may have different format, so we compare InetSocketAddress objects instead of IP Strings.
//e.g. fdbd:ff1:ce00:1c26::d8 and fdbd:ff1:ce00:1c26:0:0:d8
boolean isMaster = socketAddress.equals(master);
if (!isMaster && master == null && fe.getHost().equals(env.getSelfNode().getHost()) && env.isMaster()) {
if (!isMaster && master == null && fe.getNodeName().equals(env.getNodeName()) && env.isMaster()) {
isMaster = true;
}
info.add(String.valueOf(isMaster));

info.add(Integer.toString(env.getClusterId()));
info.add(String.valueOf(isJoin(allFe, fe)));

if (fe.getHost().equals(env.getSelfNode().getHost())) {
if (fe.getNodeName().equals(env.getNodeName())) {
info.add("true");
info.add(Long.toString(env.getEditLog().getMaxJournalId()));
} else {
Expand All @@ -174,7 +170,7 @@ public static void getFrontendsInfo(Env env, List<List<String>> infos, String cu

public static Frontend getCurrentFrontendVersion(Env env) {
for (Frontend fe : env.getFrontends(null /* all */)) {
if (fe.getHost().equals(env.getSelfNode().getHost())) {
if (fe.getNodeName().equals(env.getNodeName())) {
return fe;
}
}
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/qe/ConnectPoolMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public List<List<String>> listConnectionForRpc(UserIdentity userIdentity, boolea
for (ConnectContext ctx : connectionMap.values()) {
// Check auth
if (!ctx.getCurrentUserIdentity().equals(userIdentity) && !Env.getCurrentEnv().getAccessManager()
.checkGlobalPriv(userIdentity, PrivPredicate.GRANT)) {
.checkGlobalPriv(userIdentity, PrivPredicate.ADMIN)) {
continue;
}
list.add(ctx.toThreadInfo(isShowFullSql).toRow(-1, nowMs, timeZone));
Expand Down
Loading