This is an automated email from the ASF dual-hosted git repository.
aajisaka 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 89314a7b HDFS-15613. RBF: Router FSCK fails after HDFS-14442. (#2360)
89314a7b is described below
commit 89314a7baec848459151a3498c6ca756d8e1dea3
Author: Akira Ajisaka <aajis...@apache.org>
AuthorDate: Wed Oct 7 13:37:45 2020 +0900
HDFS-15613. RBF: Router FSCK fails after HDFS-14442. (#2360)
* Support getHAServiceState in DFSRouter
(cherry picked from commit 074f0d46af9993b7d2cc5ac63105a934ccbf6b95)
---
.../hdfs/server/federation/router/RouterClientProtocol.java | 9 +++++----
.../hdfs/server/federation/router/RouterRpcServer.java | 13 +++++++++++--
.../hdfs/server/federation/router/TestRouterAdminCLI.java | 6 ++++++
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java
index 6a28c4f..4d3493a 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java
@@ -1768,10 +1768,11 @@ public class RouterClientProtocol implements
ClientProtocol {
}
@Override
- public HAServiceProtocol.HAServiceState getHAServiceState()
- throws IOException {
- rpcServer.checkOperation(NameNode.OperationCategory.READ, false);
- return null;
+ public HAServiceProtocol.HAServiceState getHAServiceState() {
+ if (rpcServer.isSafeMode()) {
+ return HAServiceProtocol.HAServiceState.STANDBY;
+ }
+ return HAServiceProtocol.HAServiceState.ACTIVE;
}
/**
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
index 4f1310b..0f23d1c 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
@@ -526,8 +526,7 @@ public class RouterRpcServer extends AbstractService
implements ClientProtocol,
* client requests.
*/
private void checkSafeMode() throws StandbyException {
- RouterSafemodeService safemodeService = router.getSafemodeService();
- if (safemodeService != null && safemodeService.isInSafeMode()) {
+ if (isSafeMode()) {
// Throw standby exception, router is not available
if (rpcMonitor != null) {
rpcMonitor.routerFailureSafemode();
@@ -539,6 +538,16 @@ public class RouterRpcServer extends AbstractService
implements ClientProtocol,
}
/**
+ * Return true if the Router is in safe mode.
+ *
+ * @return true if the Router is in safe mode.
+ */
+ boolean isSafeMode() {
+ RouterSafemodeService safemodeService = router.getSafemodeService();
+ return (safemodeService != null && safemodeService.isInSafeMode());
+ }
+
+ /**
* Get the name of the method that is calling this function.
*
* @return Name of the method calling this function.
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 868d194..837607c 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
@@ -932,6 +932,10 @@ public class TestRouterAdminCLI {
// ensure the Router become RUNNING state
waitState(RouterServiceState.RUNNING);
assertFalse(routerContext.getRouter().getSafemodeService().isInSafeMode());
+ final RouterClientProtocol clientProtocol =
+ routerContext.getRouter().getRpcServer().getClientProtocolModule();
+ assertEquals(HAServiceState.ACTIVE, clientProtocol.getHAServiceState());
+
assertEquals(0,
ToolRunner.run(admin, new String[] {"-safemode", "enter" }));
@@ -944,6 +948,7 @@ public class TestRouterAdminCLI {
// verify state using RBFMetrics
assertEquals(RouterServiceState.SAFEMODE.toString(), jsonString);
assertTrue(routerContext.getRouter().getSafemodeService().isInSafeMode());
+ assertEquals(HAServiceState.STANDBY, clientProtocol.getHAServiceState());
System.setOut(new PrintStream(out));
assertEquals(0,
@@ -955,6 +960,7 @@ public class TestRouterAdminCLI {
// verify state
assertEquals(RouterServiceState.RUNNING.toString(), jsonString);
assertFalse(routerContext.getRouter().getSafemodeService().isInSafeMode());
+ assertEquals(HAServiceState.ACTIVE, clientProtocol.getHAServiceState());
out.reset();
assertEquals(0, ToolRunner.run(admin, new String[] {"-safemode", "get" }));
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
