zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2785: Server inappropriately throttles connections under loa…
Date Thu, 18 May 2017 21:15:04 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.4 ad26e22df -> 593c99c3c


ZOOKEEPER-2785: Server inappropriately throttles connections under loa…

…d before SASL completes

Author: Abhishek Singh Chouhan <abhishek.chouhan@salesforce.com>

Reviewers: Michael Han <hanm@apache.org>

Closes #256 from abhishek-chouhan/ZOOKEEPER-2785

(cherry picked from commit 0a3e2d1d4bdbb96f41da7111db3913ef08068722)
Signed-off-by: Michael Han <hanm@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/593c99c3
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/593c99c3
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/593c99c3

Branch: refs/heads/branch-3.4
Commit: 593c99c3cde9d9f24e62d1e613108e3c24d73d4c
Parents: ad26e22
Author: Abhishek Singh Chouhan <abhishek.chouhan@salesforce.com>
Authored: Thu May 18 14:14:39 2017 -0700
Committer: Michael Han <hanm@apache.org>
Committed: Thu May 18 14:15:00 2017 -0700

----------------------------------------------------------------------
 src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/593c99c3/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 b0a8341..66e5afe 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -1008,6 +1008,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider
{
                 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(),


Mime
View raw message