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:14:54 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 1b855d201 -> 561a45a1e


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/561a45a1
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/561a45a1
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/561a45a1

Branch: refs/heads/branch-3.5
Commit: 561a45a1e76f2e8f524559fbd44cf9b3d7233225
Parents: 1b855d2
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:14:49 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/561a45a1/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 026a4a4..c1d62f8 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -1098,6 +1098,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