HDFS-13862. RBF: Router logs are not capturing few of the dfsrouteradmin commands. Contributed by Ayush Saxena
(cherry picked from commit 8944407d938bb8e38c7182a68b4b64d1a7c778ca) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cbcdaefa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cbcdaefa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cbcdaefa Branch: refs/heads/branch-3.1 Commit: cbcdaefa379b2904d22753b93ede9dc0d315753a Parents: 0b97dc5 Author: Brahma Reddy Battula <bra...@apache.org> Authored: Sun Sep 9 23:20:26 2018 +0530 Committer: Brahma Reddy Battula <bra...@apache.org> Committed: Sun Sep 9 23:21:45 2018 +0530 ---------------------------------------------------------------------- .../federation/router/RouterAdminServer.java | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cbcdaefa/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java index 114f008..3509768 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java @@ -283,6 +283,13 @@ public class RouterAdminServer extends AbstractService this.router.updateRouterState(RouterServiceState.SAFEMODE); safeModeService.setManualSafeMode(true); success = verifySafeMode(true); + if (success) { + LOG.info("STATE* Safe mode is ON.\n" + "It was turned on manually. " + + "Use \"hdfs dfsrouteradmin -safemode leave\" to turn" + + " safe mode off."); + } else { + LOG.error("Unable to enter safemode."); + } } return EnterSafeModeResponse.newInstance(success); } @@ -296,6 +303,11 @@ public class RouterAdminServer extends AbstractService this.router.updateRouterState(RouterServiceState.RUNNING); safeModeService.setManualSafeMode(false); success = verifySafeMode(false); + if (success) { + LOG.info("STATE* Safe mode is OFF.\n" + "It was turned off manually."); + } else { + LOG.error("Unable to leave safemode."); + } } return LeaveSafeModeResponse.newInstance(success); } @@ -307,6 +319,7 @@ public class RouterAdminServer extends AbstractService RouterSafemodeService safeModeService = this.router.getSafemodeService(); if (safeModeService != null) { isInSafeMode = safeModeService.isInSafeMode(); + LOG.info("Safemode status retrieved successfully."); } return GetSafeModeResponse.newInstance(isInSafeMode); } @@ -340,6 +353,11 @@ public class RouterAdminServer extends AbstractService boolean success = false; if (namespaceExists(nsId)) { success = getDisabledNameserviceStore().disableNameservice(nsId); + if (success) { + LOG.info("Nameservice {} disabled successfully.", nsId); + } else { + LOG.error("Unable to disable Nameservice {}", nsId); + } } else { LOG.error("Cannot disable {}, it does not exists", nsId); } @@ -373,6 +391,11 @@ public class RouterAdminServer extends AbstractService boolean success = false; if (disabled.contains(nsId)) { success = store.enableNameservice(nsId); + if (success) { + LOG.info("Nameservice {} enabled successfully.", nsId); + } else { + LOG.error("Unable to enable Nameservice {}", nsId); + } } else { LOG.error("Cannot enable {}, it was not disabled", nsId); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org