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 9d495a3b3deb1b..4b7adbf9638766 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 static List> getFrontendWithRpcPort(Env env, boolea List> allFe = new ArrayList<>(); List 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 static void getFrontendsInfo(Env env, List> 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)); @@ -144,7 +140,7 @@ public static void getFrontendsInfo(Env env, List> 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)); @@ -152,7 +148,7 @@ public static void getFrontendsInfo(Env env, List> infos, String cu 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 static void getFrontendsInfo(Env env, List> 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; } } 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 e0f311aec8538f..b64bcdd928454e 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 List> 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));