Repository: accumulo Updated Branches: refs/heads/master 107a3ff3e -> b0f21cdef
ACCUMULO-3491 Set socket timeout for Thrift SASL Method accepted a socketTimeout but did not pass it down to the socket. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0f21cde Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b0f21cde Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b0f21cde Branch: refs/heads/master Commit: b0f21cdef40918de2d814e360c12aace9bbfc159 Parents: 107a3ff Author: Josh Elser <josh.el...@gmail.com> Authored: Mon Jan 19 16:57:48 2015 -0500 Committer: Josh Elser <josh.el...@gmail.com> Committed: Mon Jan 19 16:57:48 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b0f21cde/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java index ece46a2..59ae01f 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java @@ -354,7 +354,7 @@ public class TServerUtils { // but sadly this isn't the case. Because TSaslTransport needs to issue a handshake when it open()'s which will fail // when the server does an accept() to (presumably) wake up the eventing system. log.info("Creating SASL thread pool thrift server on port=" + address.getPort()); - TServerSocket transport = new TServerSocket(address.getPort()); + TServerSocket transport = new TServerSocket(address.getPort(), (int) socketTimeout); final String hostname; try {
