From da3cbad7640232d23dfba69222546fa5af53fb05 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Tue, 16 May 2023 10:03:14 +0800 Subject: [PATCH 1/5] fix Checkpoint error --- .../main/java/org/apache/doris/common/util/HttpURLUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java index a5394d6d48e28f..8bc223ac38eb10 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java @@ -31,7 +31,8 @@ public class HttpURLUtil { public static HttpURLConnection getConnectionWithNodeIdent(String request) throws IOException { URL url = new URL(request); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - HostInfo selfNode = Env.getCurrentEnv().getSelfNode(); + // Must use Env. getServingEnv() instead of getCurrentEnv(),because here we need to obtain selfNode through the official service catalog. + HostInfo selfNode = Env.getServingEnv().getSelfNode(); conn.setRequestProperty(Env.CLIENT_NODE_HOST_KEY, selfNode.getHost()); conn.setRequestProperty(Env.CLIENT_NODE_PORT_KEY, selfNode.getPort() + ""); return conn; From 96bb92de7ed4efcaee989d16a727638d3d9e07b0 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Tue, 16 May 2023 10:04:23 +0800 Subject: [PATCH 2/5] fix Checkpoint error --- .../src/main/java/org/apache/doris/common/util/HttpURLUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java index 8bc223ac38eb10..9902fd561426e9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java @@ -31,7 +31,7 @@ public class HttpURLUtil { public static HttpURLConnection getConnectionWithNodeIdent(String request) throws IOException { URL url = new URL(request); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - // Must use Env. getServingEnv() instead of getCurrentEnv(),because here we need to obtain selfNode through the official service catalog. + // Must use Env.getServingEnv() instead of getCurrentEnv(),because here we need to obtain selfNode through the official service catalog. HostInfo selfNode = Env.getServingEnv().getSelfNode(); conn.setRequestProperty(Env.CLIENT_NODE_HOST_KEY, selfNode.getHost()); conn.setRequestProperty(Env.CLIENT_NODE_PORT_KEY, selfNode.getPort() + ""); From 5f47c49edd7b12320694a18876b9ffd9cd7ffee1 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Tue, 16 May 2023 10:19:45 +0800 Subject: [PATCH 3/5] fix Checkpoint error --- .../main/java/org/apache/doris/common/util/HttpURLUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java index 9902fd561426e9..966bc6c66e5363 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/HttpURLUtil.java @@ -31,7 +31,8 @@ public class HttpURLUtil { public static HttpURLConnection getConnectionWithNodeIdent(String request) throws IOException { URL url = new URL(request); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - // Must use Env.getServingEnv() instead of getCurrentEnv(),because here we need to obtain selfNode through the official service catalog. + // Must use Env.getServingEnv() instead of getCurrentEnv(), + // because here we need to obtain selfNode through the official service catalog. HostInfo selfNode = Env.getServingEnv().getSelfNode(); conn.setRequestProperty(Env.CLIENT_NODE_HOST_KEY, selfNode.getHost()); conn.setRequestProperty(Env.CLIENT_NODE_PORT_KEY, selfNode.getPort() + ""); From 1479a65c4c0270087cbc5c2d27013a08e2093e1b Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Tue, 16 May 2023 12:59:21 +0800 Subject: [PATCH 4/5] fix Checkpoint error --- .../main/java/org/apache/doris/httpv2/meta/MetaService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java index 6deea9f0e425cf..2c931e66840d53 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java @@ -71,7 +71,8 @@ private boolean isFromValidFe(HttpServletRequest request) { Frontend fe = Env.getCurrentEnv().checkFeExist(clientHost, clientPort); if (fe == null) { - LOG.warn("request is not from valid FE. client: {}", clientHost); + LOG.warn("request is not from valid FE. client: {}, {}, exists fes {}", clientHost, clientPort, + Env.getCurrentEnv().getFrontends(null)); return false; } return true; @@ -157,7 +158,7 @@ public Object put(HttpServletRequest request, HttpServletResponse response) thro checkLongParam(versionStr); - String machine = request.getRemoteHost(); + String machine = request.getHeader(Env.CLIENT_NODE_HOST_KEY); String url = "http://" + NetUtils.getHostPortInAccessibleFormat(machine, Integer.valueOf(portStr)) + "/image?version=" + versionStr; String filename = Storage.IMAGE + "." + versionStr; From 601373799b6c89f9bb5cc879422002f9e0f154b1 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Tue, 16 May 2023 14:48:08 +0800 Subject: [PATCH 5/5] fix Checkpoint error --- .../main/java/org/apache/doris/httpv2/meta/MetaService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java index 2c931e66840d53..cc0cb47a637c9e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java @@ -71,8 +71,7 @@ private boolean isFromValidFe(HttpServletRequest request) { Frontend fe = Env.getCurrentEnv().checkFeExist(clientHost, clientPort); if (fe == null) { - LOG.warn("request is not from valid FE. client: {}, {}, exists fes {}", clientHost, clientPort, - Env.getCurrentEnv().getFrontends(null)); + LOG.warn("request is not from valid FE. client: {}, {}", clientHost, clientPortStr); return false; } return true; @@ -158,7 +157,7 @@ public Object put(HttpServletRequest request, HttpServletResponse response) thro checkLongParam(versionStr); - String machine = request.getHeader(Env.CLIENT_NODE_HOST_KEY); + String machine = request.getRemoteHost(); String url = "http://" + NetUtils.getHostPortInAccessibleFormat(machine, Integer.valueOf(portStr)) + "/image?version=" + versionStr; String filename = Storage.IMAGE + "." + versionStr;