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 in...@apache.org on 2019/03/03 01:17:45 UTC
[hadoop] branch HDFS-13891 updated: HDFS-14259. RBF: Fix safemode
message for Router. Contributed by Ranith Sadar.
This is an automated email from the ASF dual-hosted git repository.
inigoiri pushed a commit to branch HDFS-13891
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/HDFS-13891 by this push:
new c24dec7 HDFS-14259. RBF: Fix safemode message for Router. Contributed by Ranith Sadar.
c24dec7 is described below
commit c24dec7963979aac0e900aa11a6c6e46f4847584
Author: Inigo Goiri <in...@apache.org>
AuthorDate: Sat Mar 2 17:17:34 2019 -0800
HDFS-14259. RBF: Fix safemode message for Router. Contributed by Ranith Sadar.
---
.../hdfs/server/federation/metrics/NamenodeBeanMetrics.java | 2 +-
.../hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
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 963c6c2..c1ced7b 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
@@ -234,7 +234,7 @@ public class NamenodeBeanMetrics
@Override
public String getSafemode() {
try {
- if (!getRouter().isRouterState(RouterServiceState.SAFEMODE)) {
+ if (getRouter().isRouterState(RouterServiceState.SAFEMODE)) {
return "Safe mode is ON. " + this.getSafeModeTip();
}
} catch (IOException e) {
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java
index 9f53dd4..486d4a0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java
@@ -747,6 +747,9 @@ public class TestRouterAdminCLI {
FederationMetrics metrics = router.getMetrics();
String jsonString = metrics.getRouterStatus();
+ String result = router.getNamenodeMetrics().getSafemode();
+ assertTrue("Wrong safe mode message: " + result,
+ result.startsWith("Safe mode is ON."));
// verify state using FederationMetrics
assertEquals(RouterServiceState.SAFEMODE.toString(), jsonString);
@@ -756,6 +759,9 @@ public class TestRouterAdminCLI {
assertEquals(0,
ToolRunner.run(admin, new String[] {"-safemode", "leave" }));
jsonString = metrics.getRouterStatus();
+ result = router.getNamenodeMetrics().getSafemode();
+ assertEquals("Wrong safe mode message: " + result, "", result);
+
// verify state
assertEquals(RouterServiceState.RUNNING.toString(), jsonString);
assertFalse(routerContext.getRouter().getSafemodeService().isInSafeMode());
@@ -1153,4 +1159,4 @@ public class TestRouterAdminCLI {
argv = new String[] {"-getDestination /file1.txt /file2.txt"};
assertEquals(-1, ToolRunner.run(admin, argv));
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org