Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix]Decommission command throws KeeperErrorCode exception when autoRecovery is disabled #4490

Merged
merged 7 commits into from
Sep 3, 2024
Merged

[fix]Decommission command throws KeeperErrorCode exception when autoRecovery is disabled #4490

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a4d108
[fix]Decommission command throws KeeperErrorCode exception when autoR…
315157973 Aug 25, 2024
4cfc860
[fix]Decommission command throws KeeperErrorCode exception when autoR…
315157973 Aug 25, 2024
b3f8b7c
Update bookkeeper-server/src/main/java/org/apache/bookkeeper/client/B…
315157973 Aug 29, 2024
1f9a47e
Update bookkeeper-server/src/main/java/org/apache/bookkeeper/client/B…
315157973 Aug 29, 2024
ecc5ee3
Adopt suggestions
315157973 Aug 29, 2024
14237cb
fix check style
315157973 Aug 29, 2024
6f66bf3
fix check style
315157973 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1553,7 +1553,16 @@ public void triggerAudit()
throw new UnavailableException("Autorecovery is disabled. So giving up!");
}

BookieId auditorId = getLedgerAuditorManager().getCurrentAuditor();
BookieId auditorId = null;
try {
auditorId = getLedgerAuditorManager().getCurrentAuditor();
} catch (IOException e) {
if (e.getCause() instanceof KeeperException.NoNodeException) {
LOG.error("Can not find node for {}", e.getCause().getMessage());
315157973 marked this conversation as resolved.
Show resolved Hide resolved
throw new UnavailableException("Autorecovery is disabled. So giving up!");
315157973 marked this conversation as resolved.
Show resolved Hide resolved
}
throw e;
}
if (auditorId == null) {
LOG.error("No auditor elected, though Autorecovery is enabled. So giving up.");
throw new UnavailableException("No auditor elected, though Autorecovery is enabled. So giving up.");
Expand Down
14 changes: 14 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/ClusterInfoCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -60,4 +63,15 @@ public void testClusterInfo() throws Exception {
assertTrue(info.isLedgerReplicationEnabled());
}

@Test
public void testRecoveryDisabled() {
try (BookKeeperAdmin bookKeeperAdmin = new BookKeeperAdmin(super.bkc)) {
bookKeeperAdmin.triggerAudit();
fail("should failed");
} catch (Exception e) {
assertTrue(e instanceof ReplicationException.UnavailableException);
assertTrue(e.getMessage().contains("Autorecovery is disabled. So giving up"));
}
}

}