You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by mm...@apache.org on 2017/05/09 21:07:50 UTC
bookkeeper git commit: BOOKKEEPER-1052: Print autorecovery enabled or
not in bookie shell
Repository: bookkeeper
Updated Branches:
refs/heads/master 1a2e017b6 -> 5531014ab
BOOKKEEPER-1052: Print autorecovery enabled or not in bookie shell
Print the current status of auto-recovery, whether it's enabled or disabled.
Author: Siddharth Boobna <sb...@yahoo-inc.com>
Reviewers: Enrico Olivelli <None>
Closes #142 from merlimat/autorecovery-enabled
Project: http://git-wip-us.apache.org/repos/asf/bookkeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/bookkeeper/commit/5531014a
Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/5531014a
Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/5531014a
Branch: refs/heads/master
Commit: 5531014ab1cf282d35d4d53db975192b853bf7a6
Parents: 1a2e017
Author: Siddharth Boobna <sb...@yahoo-inc.com>
Authored: Tue May 9 14:07:45 2017 -0700
Committer: Matteo Merli <mm...@apache.org>
Committed: Tue May 9 14:07:45 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/bookkeeper/bookie/BookieShell.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/5531014a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
index 1400fcb..84505d2 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
@@ -1295,9 +1295,8 @@ public class BookieShell implements Tool {
boolean disable = cmdLine.hasOption("d");
boolean enable = cmdLine.hasOption("e");
- if ((!disable && !enable)
- || (enable && disable)) {
- LOG.error("One and only one of -enable and -disable must be specified");
+ if (enable && disable) {
+ LOG.error("Only one of -enable and -disable can be specified");
printUsage();
return 1;
}
@@ -1309,7 +1308,10 @@ public class BookieShell implements Tool {
.build();
LedgerManagerFactory mFactory = LedgerManagerFactory.newLedgerManagerFactory(bkConf, zk);
LedgerUnderreplicationManager underreplicationManager = mFactory.newLedgerUnderreplicationManager();
- if (enable) {
+ if (!enable && !disable) {
+ boolean enabled = underreplicationManager.isLedgerReplicationEnabled();
+ System.out.println("Autorecovery is " + (enabled ? "enabled." : "disabled."));
+ } else if (enable) {
if (underreplicationManager.isLedgerReplicationEnabled()) {
LOG.warn("Autorecovery already enabled. Doing nothing");
} else {