From common-commits-return-78182-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Mon Jan 29 06:10:31 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id B4A3818064F for ; Mon, 29 Jan 2018 06:10:31 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A4705160C54; Mon, 29 Jan 2018 05:10:31 +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 ECD52160C43 for ; Mon, 29 Jan 2018 06:10:30 +0100 (CET) Received: (qmail 64817 invoked by uid 500); 29 Jan 2018 05:10:24 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 63853 invoked by uid 99); 29 Jan 2018 05:10:23 -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; Mon, 29 Jan 2018 05:10:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BA560F4DDD; Mon, 29 Jan 2018 05:10:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: haibochen@apache.org To: common-commits@hadoop.apache.org Date: Mon, 29 Jan 2018 05:10:40 -0000 Message-Id: <046205f9e0a847eea6b3a64e80fa731f@git.apache.org> In-Reply-To: <523d01e1b11e49acab8eec5a1e4b73f0@git.apache.org> References: <523d01e1b11e49acab8eec5a1e4b73f0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] hadoop git commit: MAPREDUCE-7041. MR should not try to clean up at first job attempt. (Gergo Repas via Haibo Chen) MAPREDUCE-7041. MR should not try to clean up at first job attempt. (Gergo Repas via Haibo Chen) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cc108522 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cc108522 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cc108522 Branch: refs/heads/YARN-1011 Commit: cc10852252c2d69294eabc68bd032cc630a53b18 Parents: ff8378e Author: Haibo Chen Authored: Thu Jan 25 16:11:01 2018 -0800 Committer: Haibo Chen Committed: Thu Jan 25 16:11:30 2018 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc108522/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java index e6a45cf..cb65b89 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java @@ -1400,7 +1400,7 @@ public class MRAppMaster extends CompositeService { private void cleanUpPreviousJobOutput() { // recovered application masters should not remove data from previous job - if (!recovered()) { + if (!isFirstAttempt() && !recovered()) { JobContext jobContext = getJobContextFromConf(getConfig()); try { LOG.info("Starting to clean up previous job's temporary files"); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org