Repository: hadoop Updated Branches: refs/heads/branch-2 c2e14d1bb -> 1c96fd0a2 refs/heads/branch-2.6 f311023f1 -> e17fe26c8 refs/heads/branch-2.7 acafc950d -> b409ce89e refs/heads/branch-2.8 cb97d8fa6 -> a44eec1fd refs/heads/trunk 247a79060 -> 754299695
Revert "HADOOP-12672. RPC timeout should not override IPC ping interval (iwasakims)" This reverts commit f311023f1205b1ea4d51a5b9da5df89f4040af32. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e17fe26c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e17fe26c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e17fe26c Branch: refs/heads/branch-2.6 Commit: e17fe26c85eb15e8e283e8972aee59abc67d2a4a Parents: f311023 Author: Steve Loughran <[email protected]> Authored: Fri Mar 11 16:58:50 2016 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Mar 11 16:58:50 2016 +0000 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 - .../main/java/org/apache/hadoop/ipc/Client.java | 35 +++++----- .../src/main/resources/core-default.xml | 9 +-- .../java/org/apache/hadoop/ipc/TestRPC.java | 68 -------------------- 4 files changed, 20 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17fe26c/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index e17f122..5782165 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -17,8 +17,6 @@ Release 2.6.5 - UNRELEASED HADOOP-12789. log classpath of ApplicationClassLoader at INFO level (Sangjin Lee via mingma) - HADOOP-12672. RPC timeout should not override IPC ping interval (iwasakims) - OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17fe26c/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java index f11c1e1..dadfd79 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java @@ -377,16 +377,15 @@ public class Client { private Socket socket = null; // connected socket private DataInputStream in; private DataOutputStream out; - private final int rpcTimeout; + private int rpcTimeout; private int maxIdleTime; //connections will be culled if it was idle for //maxIdleTime msecs private final RetryPolicy connectionRetryPolicy; private final int maxRetriesOnSasl; private int maxRetriesOnSocketTimeouts; - private final boolean tcpNoDelay; // if T then disable Nagle's Algorithm - private final boolean doPing; //do we need to send ping message - private final int pingInterval; // how often sends ping to the server - private final int soTimeout; // used by ipc ping and rpc timeout + private boolean tcpNoDelay; // if T then disable Nagle's Algorithm + private boolean doPing; //do we need to send ping message + private int pingInterval; // how often sends ping to the server in msecs private ByteArrayOutputStream pingRequest; // ping message // currently active calls @@ -424,9 +423,6 @@ public class Client { pingHeader.writeDelimitedTo(pingRequest); } this.pingInterval = remoteId.getPingInterval(); - this.soTimeout = - (rpcTimeout == 0 || (doPing && pingInterval < rpcTimeout))? - this.pingInterval : this.rpcTimeout; this.serviceClass = serviceClass; if (LOG.isDebugEnabled()) { LOG.debug("The ping interval is " + this.pingInterval + " ms."); @@ -477,12 +473,12 @@ public class Client { /* Process timeout exception * if the connection is not going to be closed or - * the RPC is not timed out yet, send a ping. + * is not configured to have a RPC timeout, send a ping. + * (if rpcTimeout is not set to be 0, then RPC should timeout. + * otherwise, throw the timeout exception. */ - private void handleTimeout(SocketTimeoutException e, int waiting) - throws IOException { - if (shouldCloseConnection.get() || !running.get() || - (0 < rpcTimeout && rpcTimeout <= waiting)) { + private void handleTimeout(SocketTimeoutException e) throws IOException { + if (shouldCloseConnection.get() || !running.get() || rpcTimeout > 0) { throw e; } else { sendPing(); @@ -496,13 +492,11 @@ public class Client { */ @Override public int read() throws IOException { - int waiting = 0; do { try { return super.read(); } catch (SocketTimeoutException e) { - waiting += soTimeout; - handleTimeout(e, waiting); + handleTimeout(e); } } while (true); } @@ -515,13 +509,11 @@ public class Client { */ @Override public int read(byte[] buf, int off, int len) throws IOException { - int waiting = 0; do { try { return super.read(buf, off, len); } catch (SocketTimeoutException e) { - waiting += soTimeout; - handleTimeout(e, waiting); + handleTimeout(e); } } while (true); } @@ -614,7 +606,10 @@ public class Client { } NetUtils.connect(this.socket, server, connectionTimeout); - this.socket.setSoTimeout(soTimeout); + if (rpcTimeout > 0) { + pingInterval = rpcTimeout; // rpcTimeout overwrites pingInterval + } + this.socket.setSoTimeout(pingInterval); return; } catch (ConnectTimeoutException toe) { /* Check for an address change and update the local reference. http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17fe26c/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml index 0d09e87..31dcdd0 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -882,7 +882,7 @@ for ldap providers in the same way as above does. <value>true</value> <description>Send a ping to the server when timeout on reading the response, if set to true. If no failure is detected, the client retries until at least - a byte is read or the time given by ipc.client.rpc-timeout.ms is passed. + a byte is read. </description> </property> @@ -899,9 +899,10 @@ for ldap providers in the same way as above does. <name>ipc.client.rpc-timeout.ms</name> <value>0</value> <description>Timeout on waiting response from server, in milliseconds. - If ipc.client.ping is set to true and this rpc-timeout is greater than - the value of ipc.ping.interval, the effective value of the rpc-timeout is - rounded up to multiple of ipc.ping.interval. + Currently this timeout works only when ipc.client.ping is set to true + because it uses the same facilities with IPC ping. + The timeout overrides the ipc.ping.interval and client will throw exception + instead of sending ping when the interval is passed. </description> </property> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17fe26c/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java index 60eff8b..b3e0553 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java @@ -1107,74 +1107,6 @@ public class TestRPC { } } - /** - * Test RPC timeout when ipc.client.ping is false. - */ - @Test(timeout=30000) - public void testClientRpcTimeoutWithoutPing() throws Exception { - final Server server = new RPC.Builder(conf) - .setProtocol(TestProtocol.class).setInstance(new TestImpl()) - .setBindAddress(ADDRESS).setPort(0) - .setQueueSizePerHandler(1).setNumHandlers(1).setVerbose(true) - .build(); - server.start(); - - final Configuration conf = new Configuration(); - conf.setBoolean(CommonConfigurationKeys.IPC_CLIENT_PING_KEY, false); - conf.setInt(CommonConfigurationKeys.IPC_CLIENT_RPC_TIMEOUT_KEY, 1000); - final TestProtocol proxy = - RPC.getProxy(TestProtocol.class, TestProtocol.versionID, - NetUtils.getConnectAddress(server), conf); - - try { - proxy.sleep(3000); - fail("RPC should time out."); - } catch (SocketTimeoutException e) { - LOG.info("got expected timeout.", e); - } finally { - server.stop(); - RPC.stopProxy(proxy); - } - } - - /** - * Test RPC timeout greater than ipc.ping.interval. - */ - @Test(timeout=30000) - public void testClientRpcTimeoutGreaterThanPingInterval() throws Exception { - final Server server = new RPC.Builder(conf) - .setProtocol(TestProtocol.class).setInstance(new TestImpl()) - .setBindAddress(ADDRESS).setPort(0) - .setQueueSizePerHandler(1).setNumHandlers(1).setVerbose(true) - .build(); - server.start(); - - final Configuration conf = new Configuration(); - conf.setBoolean(CommonConfigurationKeys.IPC_CLIENT_PING_KEY, true); - conf.setInt(CommonConfigurationKeys.IPC_PING_INTERVAL_KEY, 800); - conf.setInt(CommonConfigurationKeys.IPC_CLIENT_RPC_TIMEOUT_KEY, 1000); - final TestProtocol proxy = - RPC.getProxy(TestProtocol.class, TestProtocol.versionID, - NetUtils.getConnectAddress(server), conf); - - // should not time out. - proxy.sleep(300); - - // should not time out because effective rpc-timeout is - // multiple of ping interval: 1600 (= 800 * (1000 / 800 + 1)) - proxy.sleep(1300); - - try { - proxy.sleep(2000); - fail("RPC should time out."); - } catch (SocketTimeoutException e) { - LOG.info("got expected timeout.", e); - } finally { - server.stop(); - RPC.stopProxy(proxy); - } - } - public static void main(String[] args) throws IOException { new TestRPC().testCallsInternal(conf);
