You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2021/03/24 09:45:07 UTC
[hadoop] 03/05: HDFS-15380. RBF: Could not fetch real remote IP in
RouterWebHdfsMethods. Contributed by tomscut.
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit e4217be749203b7040b8761f5baa6437ad4599ad
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Mon Dec 21 09:58:30 2020 +0530
HDFS-15380. RBF: Could not fetch real remote IP in RouterWebHdfsMethods. Contributed by tomscut.
(cherry picked from commit 5ab1db9e218e11d00035e234344ef90228d8898d)
---
.../hdfs/server/federation/router/RouterWebHdfsMethods.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterWebHdfsMethods.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterWebHdfsMethods.java
index 9f0d06d..061a556 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterWebHdfsMethods.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterWebHdfsMethods.java
@@ -115,20 +115,18 @@ public class RouterWebHdfsMethods extends NamenodeWebHdfsMethods {
private static final Logger LOG =
LoggerFactory.getLogger(RouterWebHdfsMethods.class);
- private static final ThreadLocal<String> REMOTE_ADDRESS =
- new ThreadLocal<String>();
-
private @Context HttpServletRequest request;
private String method;
private String query;
private String reqPath;
+ private String remoteAddr;
public RouterWebHdfsMethods(@Context HttpServletRequest request) {
super(request);
this.method = request.getMethod();
this.query = request.getQueryString();
this.reqPath = request.getServletPath();
- REMOTE_ADDRESS.set(JspHelper.getRemoteAddr(request));
+ this.remoteAddr = JspHelper.getRemoteAddr(request);
}
@Override
@@ -139,7 +137,7 @@ public class RouterWebHdfsMethods extends NamenodeWebHdfsMethods {
final Param<?, ?>... parameters) {
super.init(ugi, delegation, username, doAsUser, path, op, parameters);
- REMOTE_ADDRESS.set(JspHelper.getRemoteAddr(request));
+ remoteAddr = JspHelper.getRemoteAddr(request);
}
@Override
@@ -153,12 +151,12 @@ public class RouterWebHdfsMethods extends NamenodeWebHdfsMethods {
}
private void reset() {
- REMOTE_ADDRESS.set(null);
+ remoteAddr = null;
}
@Override
protected String getRemoteAddr() {
- return REMOTE_ADDRESS.get();
+ return remoteAddr;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org