Skip to content

ZOOKEEPER-5012: guard zkDb close in QuorumPeer shutdown #2345

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

Merged
anmolnar merged 7 commits into from
Feb 19, 2026
+13 −4
Merged

ZOOKEEPER-5012: guard zkDb close in QuorumPeer shutdown #2345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0703e20
ZOOKEEPER-5012: guard zkDb close in QuorumPeer shutdown
seekskyworld Jan 14, 2026
1c245ac
Apply suggestion from @PDavid
seekskyworld Feb 18, 2026
958a5c5
test: avoid junit5 assertDoesNotThrow
seekskyworld Feb 18, 2026
4550f84
test: add junit fail import
seekskyworld Feb 18, 2026
ee58c59
test: catch constructor exception
seekskyworld Feb 18, 2026
d4dc4c2
test: use assertDoesNotThrow
seekskyworld Feb 18, 2026
2a0d666
style: fix static import order
seekskyworld Feb 18, 2026
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
10 changes: 6 additions & 4 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,10 +1705,12 @@ public void shutdown() {
this.interrupt();
getElectionAlg().shutdown();
}
try {
zkDb.close();
} catch (IOException ie) {
LOG.warn("Error closing logs ", ie);
if (zkDb != null) {
try {
zkDb.close();
} catch (IOException ie) {
LOG.warn("Error closing logs ", ie);
}
}
}

Expand Down
7 changes: 7 additions & 0 deletions zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.zookeeper.server.quorum;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -80,6 +81,12 @@ public void testQuorumPeerListendOnSpecifiedClientIP(@TempDir File dataDir) thro
peer2.shutdown();
}

@Test
public void testShutdownWithoutZkDbDoesNotThrow() throws Exception {
QuorumPeer peer = new QuorumPeer();
assertDoesNotThrow(peer::shutdown);
Copy link
Copy Markdown
Contributor

@PDavid PDavid Feb 18, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for trying this out. 👍

I think this should have worked, just you have to add a static import for org.junit.jupiter.api.Assertions.assertDoesNotThrow next to the already existing static imports, e.g.:

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

}

@Test
public void testProcessReconfigWillRecreateSocketAddresses() throws IOException {
QuorumPeerConfig.setReconfigEnabled(true);
Expand Down