Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CBE15200C8E for ; Wed, 24 May 2017 23:07:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CABD7160BB6; Wed, 24 May 2017 21:07:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BB16A160BE4 for ; Wed, 24 May 2017 23:07:38 +0200 (CEST) Received: (qmail 23644 invoked by uid 500); 24 May 2017 21:07:37 -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 21105 invoked by uid 99); 24 May 2017 21:07:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2017 21:07:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3327AF4A48; Wed, 24 May 2017 21:07:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jeagles@apache.org To: commits@tez.apache.org Date: Wed, 24 May 2017 21:07:56 -0000 Message-Id: <8886bf222df94f1da4fda1a96b0f9ab0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [27/50] [abbrv] tez git commit: TEZ-3604. Remove the compositeInputAttemptIdentifier from remaining list upon fetch completion in the Ordered case (Kuhu Shukla via jeagles) archived-at: Wed, 24 May 2017 21:07:40 -0000 TEZ-3604. Remove the compositeInputAttemptIdentifier from remaining list upon fetch completion in the Ordered case (Kuhu Shukla via jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/29d6df2c Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/29d6df2c Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/29d6df2c Branch: refs/heads/master Commit: 29d6df2c241dab5748086d1536f3f0d41421cbe1 Parents: 0cf1ce2 Author: Jonathan Eagles Authored: Fri Feb 3 13:00:18 2017 -0600 Committer: Jonathan Eagles Committed: Fri Feb 3 13:00:18 2017 -0600 ---------------------------------------------------------------------- TEZ-3334-CHANGES.txt | 1 + .../common/shuffle/orderedgrouped/FetcherOrderedGrouped.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/29d6df2c/TEZ-3334-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-3334-CHANGES.txt b/TEZ-3334-CHANGES.txt index 8416cc9..49da5aa 100644 --- a/TEZ-3334-CHANGES.txt +++ b/TEZ-3334-CHANGES.txt @@ -4,6 +4,7 @@ Apache Tez Change Log INCOMPATIBLE CHANGES: ALL CHANGES: + TEZ-3604. Remove the compositeInputAttemptIdentifier from remaining list upon fetch completion in the Ordered case TEZ-3599. Unordered Fetcher can hang if empty partitions are present TEZ-3596. Number of Empty DME logged for Composite fetch is too high TEZ-3597. Composite Fetch hangs on certain DME empty events. http://git-wip-us.apache.org/repos/asf/tez/blob/29d6df2c/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java index f213268..6bdb453 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/FetcherOrderedGrouped.java @@ -278,11 +278,16 @@ class FetcherOrderedGrouped extends CallableWithNdc { // yet_to_be_fetched list and marking the failed tasks. InputAttemptIdentifier[] failedTasks = null; while (!remaining.isEmpty() && failedTasks == null) { + String inputAttemptIdentifierId = + remaining.entrySet().iterator().next().getKey(); // fail immediately after first failure because we dont know how much to // skip for this error in the input stream. So we cannot move on to the // remaining outputs. YARN-1773. Will get to them in the next retry. try { failedTasks = copyMapOutput(host, input); + if (failedTasks == null || failedTasks.length == 0) { + remaining.remove(inputAttemptIdentifierId); + } } catch (FetcherReadTimeoutException e) { // Setup connection again if disconnected cleanupCurrentConnection(true); @@ -568,7 +573,6 @@ class FetcherOrderedGrouped extends CallableWithNdc { scheduler.copySucceeded(srcAttemptId, host, compressedLength, decompressedLength, endTime - startTime, mapOutput, false); // Note successful shuffle - remaining.remove(srcAttemptId.toString()); metrics.successFetch(); } } catch(IOException ioe) {