Repository: hive Updated Branches: refs/heads/master 791066178 -> 401b14ac7
HIVE-15671: RPCServer.registerClient() erroneously uses server/client handshake timeout for connection timeout (reviewed by Jimmy) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/401b14ac Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/401b14ac Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/401b14ac Branch: refs/heads/master Commit: 401b14ac778ff58cbc5e76f08de002ea4edf3c57 Parents: 7910661 Author: Xuefu Zhang <[email protected]> Authored: Mon Feb 13 11:08:53 2017 -0800 Committer: Xuefu Zhang <[email protected]> Committed: Mon Feb 13 11:08:53 2017 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hive/spark/client/rpc/Rpc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/401b14ac/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java ---------------------------------------------------------------------- diff --git a/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java b/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java index b2f133b..0489684 100644 --- a/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java +++ b/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java @@ -120,7 +120,7 @@ public class Rpc implements Closeable { } }; final ScheduledFuture<?> timeoutFuture = eloop.schedule(timeoutTask, - rpcConf.getServerConnectTimeoutMs(), TimeUnit.MILLISECONDS); + connectTimeoutMs, TimeUnit.MILLISECONDS); // The channel listener instantiates the Rpc instance when the connection is established, // and initiates the SASL handshake.
