This is an automated email from the ASF dual-hosted git repository.
tasanuma 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 2752156 HDFS-15974. RBF: Unable to display the datanode UI of the
router (#2915)
2752156 is described below
commit 2752156e3ed65f34bdfe9dd47fa3a9b44313b44c
Author: zhuxiangyi <[email protected]>
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 <[email protected]>
Reviewed-by: Inigo Goiri <[email protected]>
Signed-off-by: Takanobu Asanuma <[email protected]>
(cherry picked from commit dff95c5eca1c0d9a43b5734f93320fa51aee63da)
---
.../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 f589602..9fdccad 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
@@ -825,7 +825,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 082094e5..c208f5c 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
@@ -1718,6 +1718,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: [email protected]
For additional commands, e-mail: [email protected]
