Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-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 EF5BF180E7 for ; Thu, 24 Sep 2015 18:13:01 +0000 (UTC) Received: (qmail 70690 invoked by uid 500); 24 Sep 2015 18:13:01 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 70656 invoked by uid 500); 24 Sep 2015 18:13:01 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 70642 invoked by uid 99); 24 Sep 2015 18:13:01 -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; Thu, 24 Sep 2015 18:13:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B39A8E10F4; Thu, 24 Sep 2015 18:13:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmitriusan@apache.org To: commits@ambari.apache.org Date: Thu, 24 Sep 2015 18:13:01 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] ambari git commit: AMBARI-13232. Remove wrong properties from 2.2 YARN config (dlysnichenko) Repository: ambari Updated Branches: refs/heads/branch-2.1 d3cbeb6da -> da6c1e841 refs/heads/branch-2.1.2 614799dfa -> 42f6747c6 refs/heads/trunk 577334084 -> d66b4de05 AMBARI-13232. Remove wrong properties from 2.2 YARN config (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/42f6747c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/42f6747c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/42f6747c Branch: refs/heads/branch-2.1.2 Commit: 42f6747c66686a690f037b2788fdd35ae14e52c5 Parents: 614799d Author: Lisnichenko Dmitro Authored: Thu Sep 24 21:11:32 2015 +0300 Committer: Lisnichenko Dmitro Committed: Thu Sep 24 21:11:32 2015 +0300 ---------------------------------------------------------------------- .../services/YARN/configuration/capacity-scheduler.xml | 10 ---------- .../services/YARN/configuration/capacity-scheduler.xml | 10 ---------- .../upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json | 4 ++-- .../upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json | 4 ++-- .../upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json | 4 ++-- .../upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json | 4 ++-- .../upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json | 4 ++-- 7 files changed, 10 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/42f6747c/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml index f1d4b48..8e79024 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml @@ -41,16 +41,6 @@ - yarn.scheduler.capacity.root.accessible-node-labels.default.capacity - -1 - - - - yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity - -1 - - - yarn.scheduler.capacity.root.default-node-label-expression http://git-wip-us.apache.org/repos/asf/ambari/blob/42f6747c/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml index fd9980c..f680b5b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml @@ -18,16 +18,6 @@ - yarn.scheduler.capacity.root.accessible-node-labels.default.capacity - true - - - - yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity - true - - - yarn.scheduler.capacity.root.default-node-label-expression true http://git-wip-us.apache.org/repos/asf/ambari/blob/42f6747c/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json index d5087c3..102271e 100644 --- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json +++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json @@ -162,8 +162,8 @@ "yarn.scheduler.capacity.root.default.state": "RUNNING", "yarn.scheduler.capacity.root.default.user-limit-factor": "1", "yarn.scheduler.capacity.root.queues": "default", - "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": "-1", - "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": "-1", + "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": {"remove": "yes"}, + "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": {"remove": "yes"}, "yarn.scheduler.capacity.resource-calculator": "org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator", "yarn.scheduler.capacity.default.minimum-user-limit-percent": "100", "yarn.scheduler.capacity.node-locality-delay": "40", http://git-wip-us.apache.org/repos/asf/ambari/blob/42f6747c/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json index cc4400a..0d3e892 100644 --- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json +++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json @@ -61,8 +61,8 @@ "capacity-scheduler": { "yarn.scheduler.capacity.resource-calculator": "org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator", "yarn.scheduler.capacity.root.accessible-node-labels": "*", - "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": "-1", - "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": "-1", + "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": {"remove": "yes"}, + "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": {"remove": "yes"}, "yarn.scheduler.capacity.root.default-node-label-expression": " " }, "core-site": { http://git-wip-us.apache.org/repos/asf/ambari/blob/42f6747c/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json index 89c732a..ad360b6 100755 --- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json +++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json @@ -73,8 +73,8 @@ "capacity-scheduler": { "yarn.scheduler.capacity.resource-calculator": "org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator", "yarn.scheduler.capacity.root.accessible-node-labels": "*", - "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": "-1", - "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": "-1", + "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": {"remove": "yes"}, + "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": {"remove": "yes"}, "yarn.scheduler.capacity.root.default-node-label-expression": " " }, "cluster-env": { http://git-wip-us.apache.org/repos/asf/ambari/blob/42f6747c/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json index 017fb73..de28827 100644 --- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json +++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json @@ -73,8 +73,8 @@ "capacity-scheduler": { "yarn.scheduler.capacity.resource-calculator": "org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator", "yarn.scheduler.capacity.root.accessible-node-labels": "*", - "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": "-1", - "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": "-1", + "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": {"remove": "yes"}, + "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": {"remove": "yes"}, "yarn.scheduler.capacity.root.default-node-label-expression": " " }, "core-site": { http://git-wip-us.apache.org/repos/asf/ambari/blob/42f6747c/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json index 17f9030..9a4d3e2 100644 --- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json +++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json @@ -79,8 +79,8 @@ "capacity-scheduler": { "yarn.scheduler.capacity.resource-calculator": "org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator", "yarn.scheduler.capacity.root.accessible-node-labels": "*", - "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": "-1", - "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": "-1", + "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": {"remove": "yes"}, + "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": {"remove": "yes"}, "yarn.scheduler.capacity.root.default-node-label-expression": " " }, "cluster-env": {