Skip to content

Commit 5ab1db9

Browse files
committed
HDFS-15380. RBF: Could not fetch real remote IP in RouterWebHdfsMethods. Contributed by tomscut.
1 parent bb528e3 commit 5ab1db9

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterWebHdfsMethods.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,18 @@ public class RouterWebHdfsMethods extends NamenodeWebHdfsMethods {
115115
private static final Logger LOG =
116116
LoggerFactory.getLogger(RouterWebHdfsMethods.class);
117117

118-
private static final ThreadLocal<String> REMOTE_ADDRESS =
119-
new ThreadLocal<String>();
120-
121118
private @Context HttpServletRequest request;
122119
private String method;
123120
private String query;
124121
private String reqPath;
122+
private String remoteAddr;
125123

126124
public RouterWebHdfsMethods(@Context HttpServletRequest request) {
127125
super(request);
128126
this.method = request.getMethod();
129127
this.query = request.getQueryString();
130128
this.reqPath = request.getServletPath();
131-
REMOTE_ADDRESS.set(JspHelper.getRemoteAddr(request));
129+
this.remoteAddr = JspHelper.getRemoteAddr(request);
132130
}
133131

134132
@Override
@@ -139,7 +137,7 @@ protected void init(final UserGroupInformation ugi,
139137
final Param<?, ?>... parameters) {
140138
super.init(ugi, delegation, username, doAsUser, path, op, parameters);
141139

142-
REMOTE_ADDRESS.set(JspHelper.getRemoteAddr(request));
140+
remoteAddr = JspHelper.getRemoteAddr(request);
143141
}
144142

145143
@Override
@@ -153,12 +151,12 @@ protected ClientProtocol getRpcClientProtocol() throws IOException {
153151
}
154152

155153
private void reset() {
156-
REMOTE_ADDRESS.set(null);
154+
remoteAddr = null;
157155
}
158156

159157
@Override
160158
protected String getRemoteAddr() {
161-
return REMOTE_ADDRESS.get();
159+
return remoteAddr;
162160
}
163161

164162
@Override

0 commit comments

Comments
 (0)