Repository: hadoop
Updated Branches:
refs/heads/branch-2 06bebcc7d -> d2c3a56ad
HDFS-13195. DataNode conf page cannot display the current value after reconfig.
Contributed by maobaolong.
(cherry picked from commit 66461ed98b0b2f630b682bff927dbd74c251c26e)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d2c3a56a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d2c3a56a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d2c3a56a
Branch: refs/heads/branch-2
Commit: d2c3a56ad8cd331040d737d0da23d1cd108987a4
Parents: 06bebcc
Author: Kihwal Lee <[email protected]>
Authored: Thu Mar 22 12:31:52 2018 -0500
Committer: Kihwal Lee <[email protected]>
Committed: Thu Mar 22 12:31:52 2018 -0500
----------------------------------------------------------------------
.../apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2c3a56a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
----------------------------------------------------------------------
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
index a3b3b65..c44f7da 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
@@ -121,6 +121,7 @@ public class DatanodeHttpServer implements Closeable {
builder.configureXFrame(xFrameEnabled).setXFrameOption(xFrameOptionValue);
this.infoServer = builder.build();
+ this.infoServer.setAttribute(HttpServer2.CONF_CONTEXT_ATTRIBUTE, conf);
this.infoServer.addInternalServlet(null, "/streamFile/*",
StreamFile.class);
this.infoServer.addInternalServlet(null, "/getFileChecksum/*",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
