From 874f58b23ab7c2359dfcc24ad03bde926741ae70 Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Thu, 25 Apr 2013 21:09:04 +0000 Subject: [PATCH] svn merge -c 1475959 from trunk for HADOOP-9503. Remove sleep between IPC client connect timeouts. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475960 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/ipc/Client.java | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index bc7e77b575f..f9d2e592061 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -42,6 +42,9 @@ Release 2.0.5-beta - UNRELEASED HADOOP-9496. Bad merge of HADOOP-9450 on branch-2 breaks all bin/hadoop calls that need HADOOP_CLASSPATH. (harsh) + HADOOP-9503. Remove sleep between IPC client connect timeouts. + (Varun Sharma via szetszwo) + OPTIMIZATIONS HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs 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 b09d9753acc..82f7bfba53b 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 @@ -703,12 +703,6 @@ public class Client { if (curRetries >= maxRetries) { throw ioe; } - - // otherwise back off and retry - try { - Thread.sleep(1000); - } catch (InterruptedException ignored) {} - LOG.info("Retrying connect to server: " + server + ". Already tried " + curRetries + " time(s); maxRetries=" + maxRetries); }