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

Open
seekskyworld wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −4
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 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 @@ -80,6 +80,12 @@ public void testQuorumPeerListendOnSpecifiedClientIP(@TempDir File dataDir) thro
peer2.shutdown();
}

@Test
public void testShutdownWithoutZkDbDoesNotThrow() throws Exception {
QuorumPeer peer = new QuorumPeer();
peer.shutdown();
}

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