You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by br...@apache.org on 2018/07/28 02:37:25 UTC
zookeeper git commit: ZOOKEEPER-3072: Throttle race condition fix
Repository: zookeeper
Updated Branches:
refs/heads/master 726587ef5 -> 2a372fcdc
ZOOKEEPER-3072: Throttle race condition fix
Making the throttle check before passing over the request to the next thread will prevent the possibility of throttling code running after unthrottle
Added an additional async hammer thread which is pretty reliably reproduces the race condition. The globalOutstandingLimit is decreased so throttling code is executed.
Author: Botond Hejj <bo...@gmail.com>
Reviewers: Andor Molnár <an...@apache.org>, Norbert Kalmar <nk...@yahoo.com>, Benjamin Reed <br...@apache.org>
Closes #563 from bothejjms/ZOOKEEPER-3072
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/2a372fcd
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/2a372fcd
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/2a372fcd
Branch: refs/heads/master
Commit: 2a372fcdce3c0142c0bb23f06098a2c1a49f807e
Parents: 726587e
Author: Botond Hejj <bo...@gmail.com>
Authored: Fri Jul 27 19:37:08 2018 -0700
Committer: Benjamin Reed <br...@apache.org>
Committed: Fri Jul 27 19:37:08 2018 -0700
----------------------------------------------------------------------
.../zookeeper/server/ZooKeeperServer.java | 30 +++++++++-----------
1 file changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/2a372fcd/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
index b0e2d64..9596908 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -1130,24 +1130,22 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
cnxn.disableRecv();
}
return;
+ } else if (h.getType() == OpCode.sasl) {
+ Record rsp = processSasl(incomingBuffer,cnxn);
+ ReplyHeader rh = new ReplyHeader(h.getXid(), 0, KeeperException.Code.OK.intValue());
+ cnxn.sendResponse(rh,rsp, "response"); // not sure about 3rd arg..what is it?
+ return;
} else {
- if (h.getType() == OpCode.sasl) {
- Record rsp = processSasl(incomingBuffer,cnxn);
- ReplyHeader rh = new ReplyHeader(h.getXid(), 0, KeeperException.Code.OK.intValue());
- cnxn.sendResponse(rh,rsp, "response"); // not sure about 3rd arg..what is it?
- return;
- }
- else {
- Request si = new Request(cnxn, cnxn.getSessionId(), h.getXid(),
- h.getType(), incomingBuffer, cnxn.getAuthInfo());
- si.setOwner(ServerCnxn.me);
- // Always treat packet from the client as a possible
- // local request.
- setLocalSessionFlag(si);
- submitRequest(si);
- }
+ cnxn.incrOutstandingRequests(h);
+ Request si = new Request(cnxn, cnxn.getSessionId(), h.getXid(),
+ h.getType(), incomingBuffer, cnxn.getAuthInfo());
+ si.setOwner(ServerCnxn.me);
+ // Always treat packet from the client as a possible
+ // local request.
+ setLocalSessionFlag(si);
+ submitRequest(si);
+ return;
}
- cnxn.incrOutstandingRequests(h);
}
private Record processSasl(ByteBuffer incomingBuffer, ServerCnxn cnxn) throws IOException {