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 ta...@apache.org on 2021/04/23 01:19:44 UTC
[hadoop] branch trunk updated: HDFS-15974. RBF: Unable to display
the datanode UI of the router (#2915)
This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new dff95c5 HDFS-15974. RBF: Unable to display the datanode UI of the router (#2915)
dff95c5 is described below
commit dff95c5eca1c0d9a43b5734f93320fa51aee63da
Author: zhuxiangyi <82...@users.noreply.github.com>
AuthorDate: Fri Apr 23 09:19:11 2021 +0800
HDFS-15974. RBF: Unable to display the datanode UI of the router (#2915)
Co-authored-by: zhuxiangyi <zh...@360.cn>
Reviewed-by: Inigo Goiri <in...@apache.org>
Signed-off-by: Takanobu Asanuma <ta...@apache.org>
---
.../hdfs/server/federation/metrics/NamenodeBeanMetrics.java | 2 +-
.../hadoop/hdfs/server/federation/router/TestRouterRpc.java | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java
index 45ae81e..0e6e12a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java
@@ -855,7 +855,7 @@ public class NamenodeBeanMetrics
@Override
public String getEnteringMaintenanceNodes() {
- return "N/A";
+ return "{}";
}
@Override
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpc.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpc.java
index a7c0025..c3e7f10 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpc.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpc.java
@@ -1749,6 +1749,14 @@ public class TestRouterRpc {
}
@Test
+ public void testNamenodeMetricsEnteringMaintenanceNodes() throws IOException {
+ final NamenodeBeanMetrics metrics =
+ router.getRouter().getNamenodeMetrics();
+
+ assertEquals("{}", metrics.getEnteringMaintenanceNodes());
+ }
+
+ @Test
public void testCacheAdmin() throws Exception {
DistributedFileSystem routerDFS = (DistributedFileSystem) routerFS;
// Verify cache directive commands.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org