This is an automated email from the ASF dual-hosted git repository.

morrySnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d28423c726 [fix](process list) return unexpected result in FULL mode 
(#64631)
6d28423c726 is described below

commit 6d28423c7264e766249d2592ad95666df0a30c1f
Author: morrySnow <[email protected]>
AuthorDate: Mon Jun 22 10:58:15 2026 +0800

    [fix](process list) return unexpected result in FULL mode (#64631)
    
    ### What problem does this PR solve?
    
    Related PR: #25052 #50939
    
    Problem Summary:
    
    2 issues:
    - self fe check is not stable
    - rpc privilege check should use ADMIN instead of GRANT
---
 .../org/apache/doris/common/proc/FrontendsProcNode.java  | 16 ++++++----------
 .../main/java/org/apache/doris/qe/ConnectPoolMgr.java    |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java 
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java
index 9d495a3b3de..4b7adbf9638 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java
@@ -79,14 +79,10 @@ public class FrontendsProcNode implements ProcNodeInterface 
{
         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;
@@ -129,7 +125,7 @@ public class FrontendsProcNode implements ProcNodeInterface 
{
             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));
@@ -144,7 +140,7 @@ public class FrontendsProcNode implements ProcNodeInterface 
{
             //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));
@@ -152,7 +148,7 @@ public class FrontendsProcNode implements ProcNodeInterface 
{
             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 {
@@ -174,7 +170,7 @@ public class FrontendsProcNode implements ProcNodeInterface 
{
 
     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;
             }
         }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectPoolMgr.java 
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectPoolMgr.java
index e0f311aec85..b64bcdd9284 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectPoolMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectPoolMgr.java
@@ -141,7 +141,7 @@ public class ConnectPoolMgr {
         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));


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to