Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E8E9810DC7 for ; Wed, 14 Jan 2015 02:10:05 +0000 (UTC) Received: (qmail 48720 invoked by uid 500); 14 Jan 2015 02:10:07 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 48645 invoked by uid 500); 14 Jan 2015 02:10:07 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 48636 invoked by uid 99); 14 Jan 2015 02:10:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jan 2015 02:10:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D1951A221CA; Wed, 14 Jan 2015 02:10:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: junping_du@apache.org To: common-commits@hadoop.apache.org Message-Id: <661f1f603bcb48f0b90d4e4bba55706e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-3019. Make work-preserving-recovery the default mechanism for RM recovery. (Contributed by Jian He) Date: Wed, 14 Jan 2015 02:10:06 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk c53420f58 -> f92e50380 YARN-3019. Make work-preserving-recovery the default mechanism for RM recovery. (Contributed by Jian He) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f92e5038 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f92e5038 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f92e5038 Branch: refs/heads/trunk Commit: f92e5038000a012229c304bc6e5281411eff2883 Parents: c53420f Author: Junping Du Authored: Tue Jan 13 18:20:57 2015 -0800 Committer: Junping Du Committed: Tue Jan 13 18:20:57 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 +- .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f92e5038/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index bbdfcb5..1d2acc1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -183,6 +183,9 @@ Release 2.7.0 - UNRELEASED YARN-2643. Don't create a new DominantResourceCalculator on every FairScheduler.allocate call. (kasha via rkanter) + YARN-3019. Make work-preserving-recovery the default mechanism for RM + recovery. (Jian He via junping_du) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f92e5038/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 3273b47..0e92194 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -378,7 +378,7 @@ public class YarnConfiguration extends Configuration { + "work-preserving-recovery.enabled"; @Private public static final boolean DEFAULT_RM_WORK_PRESERVING_RECOVERY_ENABLED = - false; + true; public static final String RM_WORK_PRESERVING_RECOVERY_SCHEDULING_WAIT_MS = RM_PREFIX + "work-preserving-recovery.scheduling-wait-ms"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/f92e5038/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index 7dea2c3..349e57b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -271,7 +271,7 @@ to YARN for experimenting the feature. yarn.resourcemanager.work-preserving-recovery.enabled - false + true