You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/09/24 20:13:01 UTC
[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 <dl...@hortonworks.com>
Authored: Thu Sep 24 21:11:32 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
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 @@
<description></description>
</property>
<property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</name>
- <value>-1</value>
- <description></description>
- </property>
- <property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</name>
- <value>-1</value>
- <description></description>
- </property>
- <property>
<name>yarn.scheduler.capacity.root.default-node-label-expression</name>
<value> </value>
<description></description>
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 @@
<configuration supports_final="false">
<property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</name>
- <deleted>true</deleted>
- </property>
-
- <property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</name>
- <deleted>true</deleted>
- </property>
-
- <property>
<name>yarn.scheduler.capacity.root.default-node-label-expression</name>
<deleted>true</deleted>
</property>
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": {
[3/3] ambari git commit: AMBARI-13232. Remove wrong properties from
2.2 YARN config (dlysnichenko)
Posted by dm...@apache.org.
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/d66b4de0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d66b4de0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d66b4de0
Branch: refs/heads/trunk
Commit: d66b4de05cab88b3cfb5425c1a11a4f8ba65196e
Parents: 5773340
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Sep 24 21:11:32 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Sep 24 21:12:41 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/d66b4de0/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 @@
<description></description>
</property>
<property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</name>
- <value>-1</value>
- <description></description>
- </property>
- <property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</name>
- <value>-1</value>
- <description></description>
- </property>
- <property>
<name>yarn.scheduler.capacity.root.default-node-label-expression</name>
<value> </value>
<description></description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d66b4de0/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 @@
<configuration supports_final="false">
<property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</name>
- <deleted>true</deleted>
- </property>
-
- <property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</name>
- <deleted>true</deleted>
- </property>
-
- <property>
<name>yarn.scheduler.capacity.root.default-node-label-expression</name>
<deleted>true</deleted>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d66b4de0/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/d66b4de0/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/d66b4de0/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/d66b4de0/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/d66b4de0/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": {
[2/3] ambari git commit: AMBARI-13232. Remove wrong properties from
2.2 YARN config (dlysnichenko)
Posted by dm...@apache.org.
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/da6c1e84
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da6c1e84
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da6c1e84
Branch: refs/heads/branch-2.1
Commit: da6c1e8416fa03d581cdac0677f0c67dd14f844d
Parents: d3cbeb6
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Sep 24 21:11:32 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Sep 24 21:12:29 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/da6c1e84/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 @@
<description></description>
</property>
<property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</name>
- <value>-1</value>
- <description></description>
- </property>
- <property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</name>
- <value>-1</value>
- <description></description>
- </property>
- <property>
<name>yarn.scheduler.capacity.root.default-node-label-expression</name>
<value> </value>
<description></description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/da6c1e84/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 @@
<configuration supports_final="false">
<property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</name>
- <deleted>true</deleted>
- </property>
-
- <property>
- <name>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</name>
- <deleted>true</deleted>
- </property>
-
- <property>
<name>yarn.scheduler.capacity.root.default-node-label-expression</name>
<deleted>true</deleted>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/da6c1e84/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/da6c1e84/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/da6c1e84/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/da6c1e84/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/da6c1e84/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": {