[hadoop] branch branch-3.3 updated: HDFS-17011. Fix the metric of "HttpPort" at DataNodeInfo (#5657). Contributed by Zhaohui Wang.

[ayushsaxena]

This is an automated email from the ASF dual-hosted git repository.

ayushsaxena pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.3 by this push:
     new 5cafa1fdb99 HDFS-17011. Fix the metric of  "HttpPort" at DataNodeInfo 
(#5657). Contributed by Zhaohui Wang.
5cafa1fdb99 is described below

commit 5cafa1fdb99fffb391234b1ed02e54a82551ab25
Author: wangzhaohui <32935220+wzhallri...@users.noreply.github.com>
AuthorDate: Thu May 18 14:42:11 2023 +0800

    HDFS-17011. Fix the metric of  "HttpPort" at DataNodeInfo (#5657). 
Contributed by Zhaohui Wang.
    
    Reviewed-by: Inigo Goiri <inigo...@apache.org>
    Signed-off-by: Ayush Saxena <ayushsax...@apache.org>
---
 .../src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java  | 2 +-
 .../java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index 402d4710870..96c4ad9ae28 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -3435,7 +3435,7 @@ public class DataNode extends ReconfigurableBase
 
   @Override // DataNodeMXBean
   public String getHttpPort(){
-    return this.getConf().get("dfs.datanode.info.port");
+    return String.valueOf(infoPort);
   }
 
   @Override // DataNodeMXBean
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
index 28330139bc4..9241f57cf36 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMXBean.java
@@ -92,6 +92,7 @@ public class TestDataNodeMXBean extends 
SaslDataTransferTestCase {
       Assert.assertEquals(datanode.getRpcPort(),rpcPort);
       // get attribute "HttpPort"
       String httpPort = (String)mbs.getAttribute(mxbeanName, "HttpPort");
+      Assert.assertNotNull(httpPort);
       Assert.assertEquals(datanode.getHttpPort(),httpPort);
       // get attribute "NamenodeAddresses"
       String namenodeAddresses = (String)mbs.getAttribute(mxbeanName, 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org