[fix]Decommission command throws KeeperErrorCode exception when autoR…

…ecovery is disabled
apache · Aug 25, 2024 · 4a4d108 · 4a4d108
1 parent 7c41204
commit 4a4d108
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerAuditorManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerAuditorManager.java
@@ -59,7 +59,7 @@ public class ZkLedgerAuditorManager implements LedgerAuditorManager {
 
     private String myVote;
 
-    private static final String ELECTION_ZNODE = "auditorelection";
+    public static final String ELECTION_ZNODE = "auditorelection";
 
     // Represents the index of the auditor node
     private static final int AUDITOR_INDEX = 0;

diff --git a/...eper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java b/...eper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
@@ -19,6 +19,7 @@
 package org.apache.bookkeeper.meta;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.bookkeeper.meta.ZkLedgerAuditorManager.ELECTION_ZNODE;
 
 import com.google.common.base.Joiner;
 import com.google.common.util.concurrent.RateLimiter;
@@ -737,6 +738,10 @@ public boolean isLedgerReplicationEnabled()
             LOG.debug("isLedgerReplicationEnabled()");
         }
         try {
+            String electionRoot = basePath + '/' + BookKeeperConstants.UNDER_REPLICATION_NODE + '/' + ELECTION_ZNODE;
+            if (zkc.exists(electionRoot, false) == null) {
+                return false;
+            }
             return null == zkc.exists(basePath + '/'
                 + BookKeeperConstants.DISABLE_NODE, false);
         } catch (KeeperException ke) {

diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/ClusterInfoCommandTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/ClusterInfoCommandTest.java
@@ -23,8 +23,11 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import org.apache.bookkeeper.client.BookKeeperAdmin;
 import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.replication.ReplicationException;
 import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
 import org.apache.bookkeeper.tools.cli.commands.bookies.ClusterInfoCommand;
 import org.apache.bookkeeper.tools.framework.CliFlags;
@@ -60,4 +63,16 @@ public void testClusterInfo() throws Exception {
         assertTrue(info.isLedgerReplicationEnabled());
     }
 
+    @Test
+    public void testRecoveryDisabled() throws Exception {
+        BookKeeperAdmin bookKeeperAdmin = new BookKeeperAdmin(super.bkc);
+        try {
+            bookKeeperAdmin.triggerAudit();
+            fail("should failed");
+        } catch (Exception e) {
+            assertTrue(e instanceof ReplicationException.UnavailableException);
+            assertTrue(e.getMessage().contains("Autorecovery is disabled. So giving up"));
+        }
+    }
+
 }