Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48A2E1125E for ; Fri, 12 Sep 2014 10:23:53 +0000 (UTC) Received: (qmail 9810 invoked by uid 500); 12 Sep 2014 10:23:53 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 9771 invoked by uid 500); 12 Sep 2014 10:23:53 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 9762 invoked by uid 99); 12 Sep 2014 10:23:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Sep 2014 10:23:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B917DA1119B; Fri, 12 Sep 2014 10:23:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rbalamohan@apache.org To: commits@tez.apache.org Date: Fri, 12 Sep 2014 10:23:52 -0000 Message-Id: <56622b72e99e443bbadfe489cd54dfd6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: TEZ-1543. Shuffle Errors on heavy load (causing task retries) (Rajesh Balamohan) Repository: tez Updated Branches: refs/heads/branch-0.5 aa8d8053e -> 486c0b74e TEZ-1543. Shuffle Errors on heavy load (causing task retries) (Rajesh Balamohan) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/91df2c84 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/91df2c84 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/91df2c84 Branch: refs/heads/branch-0.5 Commit: 91df2c84511095b259dbaeb27283a9a11f2956fd Parents: aa8d805 Author: Rajesh Balamohan Authored: Fri Sep 12 03:57:40 2014 +0530 Committer: Rajesh Balamohan Committed: Fri Sep 12 15:51:56 2014 +0530 ---------------------------------------------------------------------- .../tez/runtime/library/shuffle/common/HttpConnection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/91df2c84/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/HttpConnection.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/HttpConnection.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/HttpConnection.java index 7208c16..d664f88 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/HttpConnection.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/HttpConnection.java @@ -160,7 +160,7 @@ public class HttpConnection { break; } catch (IOException ioe) { // Don't attempt another connect if already cleanedup. - if (!cleanup) { + if (cleanup) { LOG.info("Cleanup is set to true. Not attempting to" + " connect again. Last exception was: [" + ioe.getClass().getName() + ", " + ioe.getMessage() + "]"); @@ -170,7 +170,7 @@ public class HttpConnection { connectionTimeout -= unit; // throw an exception if we have waited for timeout amount of time // note that the updated value if timeout is used here - if (connectionTimeout == 0) { + if (connectionTimeout <= 0) { throw ioe; } // reset the connect timeout for the last try