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/23 20:18:32 UTC
[2/4] ambari git commit: AMBARI-13207. RU multiple service checks
failed (possibly, Illegal capacity of 0.0 for children) (dlysnichenko)
AMBARI-13207. RU multiple service checks failed (possibly, Illegal capacity of 0.0 for children) (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/78d84c82
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/78d84c82
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/78d84c82
Branch: refs/heads/branch-2.1
Commit: 78d84c820d7ee3db513d7eaddf11dede9511df95
Parents: be74389
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Sep 23 21:15:49 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Sep 23 21:16:43 2015 +0300
----------------------------------------------------------------------
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 18 ++++++------------
.../YARN/configuration/capacity-scheduler.xml | 10 ----------
.../catalog/UpgradeCatalog_2.1_to_2.3.json | 6 ++----
.../catalog/UpgradeCatalog_2.2_to_2.3.json | 6 ++----
4 files changed, 10 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/78d84c82/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index 62d26a2..e6d845d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -656,20 +656,14 @@
<set key="yarn.scheduler.capacity.root.default-node-label-expression" value=""/>
</task>
- <task xsi:type="configure" summary="Checking the Capacity Scheduler root default capacity">
- <condition type="capacity-scheduler" key="yarn.scheduler.capacity.root.accessible-node-labels.default.capacity" value="-1">
- <type>capacity-scheduler</type>
- <key>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</key>
- <value>10</value>
- </condition>
+ <task xsi:type="configure" summary="Deleting the Capacity Scheduler root default capacity property">
+ <type>capacity-scheduler</type>
+ <transfer operation="delete" delete-key="yarn.scheduler.capacity.root.accessible-node-labels.default.capacity"/>
</task>
- <task xsi:type="configure" summary="Checking the Capacity Scheduler root maximum capacity">
- <condition type="capacity-scheduler" key="yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity" value="-1">
- <type>capacity-scheduler</type>
- <key>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</key>
- <value>100</value>
- </condition>
+ <task xsi:type="configure" summary="Deleting the Capacity Scheduler root maximum capacity property">
+ <type>capacity-scheduler</type>
+ <transfer operation="delete" delete-key="yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity"/>
</task>
</pre-upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/78d84c82/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
index 1642746..f755b6e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
@@ -27,16 +27,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/78d84c82/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json
index 9d2fcd1..fc2ff87 100644
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json
@@ -364,12 +364,10 @@
"capacity-scheduler": {
"yarn.scheduler.capacity.root.default-node-label-expression": "",
"yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": {
- "value": "10",
- "value-required": "-1"
+ "remove": "yes"
},
"yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": {
- "value": "100",
- "value-required": "-1"
+ "remove": "yes"
}
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/78d84c82/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
index 6b8809a..4fec857 100644
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
@@ -439,12 +439,10 @@
"capacity-scheduler": {
"yarn.scheduler.capacity.root.default-node-label-expression": "",
"yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": {
- "value": "10",
- "value-required": "-1"
+ "remove": "yes"
},
"yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": {
- "value": "100",
- "value-required": "-1"
+ "remove": "yes"
}
},
"kafka-broker": {