Skip to content

ZOOKEEPER-5051: Avoid NPE closing 4lw connection during startup #2391

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
PAC-MAJ wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −1
Open

ZOOKEEPER-5051: Avoid NPE closing 4lw connection during startup #2391

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
5 changes: 4 additions & 1 deletion zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,10 @@ protected enum State {
private final AuthenticationHelper authHelper = new AuthenticationHelper();

void removeCnxn(ServerCnxn cnxn) {
zkDb.removeCnxn(cnxn);
ZKDatabase db = zkDb;
if (db != null) {
db.removeCnxn(cnxn);
}
}

/**
Expand Down
10 changes: 10 additions & 0 deletions zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,14 @@ public void testUpdateQuotaExceededMetrics() {
public void testUpdateQuotaExceededMetrics_nullNamespace() {
assertDoesNotThrow(() -> ZooKeeperServer.updateQuotaExceededMetrics(null));
}

@Test
public void testRemoveCnxnBeforeStartData() {
// Simulate a connection cleanup triggered before the server has fully started.
// During this phase zkDb is still null (before startdata()).
// 4-letter commands can hit this path.
ZooKeeperServer zks = new ZooKeeperServer();
ServerCnxn cnxn = mock(ServerCnxn.class);
assertDoesNotThrow(() -> zks.removeCnxn(cnxn));
}
}