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

ZOOKEEPER-3652: Synchronize ClientCnxn outgoing queue flush on a stable internal value #1257

Closed
wants to merge 2 commits into from
Closed

ZOOKEEPER-3652: Synchronize ClientCnxn outgoing queue flush on a stable internal value #1257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0bc03d
ZOOKEEPER-3652: Synchronize ClientCnxn outgoing queue flush on a stab…
swallez Feb 21, 2020
82e2cad
Instruct SpotBugs that we know what we're doing when synchronizing on…
swallez Feb 27, 2020
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
6 changes: 4 additions & 2 deletions zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,7 @@ private void logStartConnect(InetSocketAddress addr) {
}

@Override
@SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
public void run() {
clientCnxnSocket.introduce(this, sessionId, outgoingQueue);
clientCnxnSocket.updateNow();
Expand Down Expand Up @@ -1303,7 +1304,7 @@ public void run() {
}
}

synchronized (state) {
synchronized (outgoingQueue) {
// When it comes to this point, it guarantees that later queued
// packet to outgoingQueue will be notified of death.
cleanup();
Expand Down Expand Up @@ -1645,6 +1646,7 @@ public Packet queuePacket(
return queuePacket(h, r, request, response, cb, clientPath, serverPath, ctx, watchRegistration, null);
}

@SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
public Packet queuePacket(
RequestHeader h,
ReplyHeader r,
Expand All @@ -1671,7 +1673,7 @@ public Packet queuePacket(
// 1. synchronize with the final cleanup() in SendThread.run() to avoid race
// 2. synchronized against each packet. So if a closeSession packet is added,
// later packet will be notified.
synchronized (state) {
synchronized (outgoingQueue) {
if (!state.isAlive() || closing) {
conLossPacket(packet);
} else {
Expand Down