From 077134b756f8d59cfdd9d4e3a66ea934af4b7ab2 Mon Sep 17 00:00:00 2001 From: Jinho Kim Date: Tue, 11 Aug 2015 17:04:20 +0900 Subject: [PATCH 1/2] TAJO-1751: Reduce the client connection timeout --- .../src/main/java/org/apache/tajo/rpc/RpcConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 165cd2a667..ab0826fbfb 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; } From a8db360f837f823ebcb9cb952d57fe51c78ec9a2 Mon Sep 17 00:00:00 2001 From: Jinho Kim Date: Tue, 11 Aug 2015 17:41:38 +0900 Subject: [PATCH 2/2] increse test timeout --- .../src/test/java/org/apache/tajo/rpc/TestAsyncRpc.java | 4 ++-- .../src/test/java/org/apache/tajo/rpc/TestBlockingRpc.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 f8c6d32ad3..18c7d80fdd 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 void testClientRetryFailureOnStartup() throws Exception { 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 void testUnresolvedAddress() throws Exception { } - @Test(timeout = 60000) + @Test(timeout = 120000) @SetupRpcConnection(setupRpcClient = false) public void testUnresolvedAddress2() throws Exception { String hostAndPort = RpcUtils.normalizeInetSocketAddress(server.getListenAddress()); 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 c86db80bda..9f95f58875 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 void testClientRetryFailureOnStartup() throws Exception { 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 void testUnresolvedAddress() throws Exception { assertTrue(expected); } - @Test + @Test(timeout = 120000) @SetupRpcConnection(setupRpcClient = false) public void testUnresolvedAddress2() throws Exception { String hostAndPort = RpcUtils.normalizeInetSocketAddress(server.getListenAddress());