You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by rb...@apache.org on 2014/09/12 12:23:52 UTC

[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 <rb...@apache.org>
Authored: Fri Sep 12 03:57:40 2014 +0530
Committer: Rajesh Balamohan <rb...@apache.org>
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


[2/2] git commit: TEZ-1543. Shuffle Errors on heavy load (causing task retries) (Rajesh Balamohan) (cherry picked from commit d1ea44d0b4f53f729fc7842b5325d0f941b6dd1c)

Posted by rb...@apache.org.
TEZ-1543. Shuffle Errors on heavy load (causing task retries)  (Rajesh Balamohan)
(cherry picked from commit d1ea44d0b4f53f729fc7842b5325d0f941b6dd1c)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/486c0b74
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/486c0b74
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/486c0b74

Branch: refs/heads/branch-0.5
Commit: 486c0b74e6dac853ce3c401a0799ec2d1959bba7
Parents: 91df2c8
Author: Rajesh Balamohan <rb...@apache.org>
Authored: Fri Sep 12 15:52:46 2014 +0530
Committer: Rajesh Balamohan <rb...@apache.org>
Committed: Fri Sep 12 15:52:46 2014 +0530

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/486c0b74/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3ff69d3..8daba15 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
   TEZ-1539. Change InputInitializerEvent semantics to SEND_ONCE_ON_TASK_SUCCESS
 
 ALL CHANGES
+  TEZ-1543. Shuffle Errors on heavy load (causing task retries)
   TEZ-1494. DAG hangs waiting for ShuffleManager.getNextInput()
   TEZ-1515. Remove usage of ResourceBundles in Counters.
   TEZ-1527. Fix indentation of Vertex status in DAGClient output.