Repository: tajo Updated Branches: refs/heads/master 080bcf772 -> 7d0608377
TAJO-1751: Reduce the client connection timeout. (jinho) Closes #683 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/7d060837 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/7d060837 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/7d060837 Branch: refs/heads/master Commit: 7d060837703244c40eff5c1e3b62f165de0887d3 Parents: 080bcf7 Author: Jinho Kim <[email protected]> Authored: Tue Aug 11 18:22:19 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Tue Aug 11 18:22:19 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../src/main/java/org/apache/tajo/rpc/RpcConstants.java | 2 +- .../src/test/java/org/apache/tajo/rpc/TestAsyncRpc.java | 4 ++-- .../src/test/java/org/apache/tajo/rpc/TestBlockingRpc.java | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/7d060837/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 1dce87c..7abf9dd 100644 --- a/CHANGES +++ b/CHANGES @@ -32,6 +32,8 @@ Release 0.11.0 - unreleased IMPROVEMENT + TAJO-1751: Reduce the client connection timeout. (jinho) + TAJO-1746: Improve resource usage at first request of DefaultTaskScheduler. (jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/7d060837/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcConstants.java ---------------------------------------------------------------------- diff --git a/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcConstants.java b/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcConstants.java index 165cd2a..ab0826f 100644 --- a/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcConstants.java +++ b/tajo-rpc/tajo-rpc-common/src/main/java/org/apache/tajo/rpc/RpcConstants.java @@ -26,7 +26,7 @@ public class RpcConstants { public static final int DEFAULT_RPC_RETRIES = 3; public static final int DEFAULT_RPC_TIMEOUT_SECONDS = 180; - public static final int DEFAULT_CONNECT_TIMEOUT = 60000; // 60 sec + public static final int DEFAULT_CONNECT_TIMEOUT = 20000; // 20 sec public static final int DEFAULT_PAUSE = 1000; // 1 sec public static final int DEFAULT_FUTURE_TIMEOUT_SECONDS = 10; } http://git-wip-us.apache.org/repos/asf/tajo/blob/7d060837/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestAsyncRpc.java ---------------------------------------------------------------------- diff --git a/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestAsyncRpc.java b/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestAsyncRpc.java index f8c6d32..18c7d80 100644 --- a/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestAsyncRpc.java +++ b/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestAsyncRpc.java @@ -402,7 +402,7 @@ public class TestAsyncRpc { assertNotNull(future.getController().errorText(), future.getController().errorText()); } - @Test(timeout = 60000) + @Test(timeout = 120000) @SetupRpcConnection(setupRpcServer = false, setupRpcClient = false) public void testUnresolvedAddress() throws Exception { InetSocketAddress address = new InetSocketAddress("test", 0); @@ -425,7 +425,7 @@ public class TestAsyncRpc { } - @Test(timeout = 60000) + @Test(timeout = 120000) @SetupRpcConnection(setupRpcClient = false) public void testUnresolvedAddress2() throws Exception { String hostAndPort = RpcUtils.normalizeInetSocketAddress(server.getListenAddress()); http://git-wip-us.apache.org/repos/asf/tajo/blob/7d060837/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestBlockingRpc.java ---------------------------------------------------------------------- diff --git a/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestBlockingRpc.java b/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestBlockingRpc.java index c86db80..9f95f58 100644 --- a/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestBlockingRpc.java +++ b/tajo-rpc/tajo-rpc-protobuf/src/test/java/org/apache/tajo/rpc/TestBlockingRpc.java @@ -363,7 +363,7 @@ public class TestBlockingRpc { RpcClientManager.cleanup(client); } - @Test(timeout = 60000) + @Test(timeout = 120000) @SetupRpcConnection(setupRpcServer = false, setupRpcClient = false) public void testUnresolvedAddress() throws Exception { InetSocketAddress address = new InetSocketAddress("test", 0); @@ -385,7 +385,7 @@ public class TestBlockingRpc { assertTrue(expected); } - @Test + @Test(timeout = 120000) @SetupRpcConnection(setupRpcClient = false) public void testUnresolvedAddress2() throws Exception { String hostAndPort = RpcUtils.normalizeInetSocketAddress(server.getListenAddress());
