You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/05/20 05:15:03 UTC
ambari git commit: AMBARI-11257. YARN Service Check job and Oozie job
don't run because of whitespace in
yarn.scheduler.capacity.root.default-node-label-expression (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 74d2d234e -> e26e8ee5e
AMBARI-11257. YARN Service Check job and Oozie job don't run because of whitespace in yarn.scheduler.capacity.root.default-node-label-expression (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e26e8ee5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e26e8ee5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e26e8ee5
Branch: refs/heads/trunk
Commit: e26e8ee5eeafd18ed25a9bf424b573ee27ccdc33
Parents: 74d2d23
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Tue May 19 16:06:02 2015 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Tue May 19 20:14:55 2015 -0700
----------------------------------------------------------------------
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 5 ++++
.../YARN/configuration/capacity-scheduler.xml | 2 +-
.../YARN/configuration/capacity-scheduler.xml | 25 ++++++++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e26e8ee5/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 e954af2..a620b05 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
@@ -407,6 +407,11 @@
<key>yarn.node-labels.enabled</key>
<value>false</value>
</task>
+ <task xsi:type="configure">
+ <type>capacity-scheduler</type>
+ <key>yarn.scheduler.capacity.root.default-node-label-expression</key>
+ <value></value>
+ </task>
</pre-upgrade>
<upgrade>
<task xsi:type="restart" />
http://git-wip-us.apache.org/repos/asf/ambari/blob/e26e8ee5/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 63d56b0..1642746 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
@@ -38,7 +38,7 @@
</property>
<property>
<name>yarn.scheduler.capacity.root.default-node-label-expression</name>
- <value> </value>
+ <value></value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e26e8ee5/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
new file mode 100644
index 0000000..f0821f3
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml
@@ -0,0 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration supports_final="false">
+ <property>
+ <name>yarn.scheduler.capacity.root.default-node-label-expression</name>
+ <value></value>
+ <description></description>
+ </property>
+
+</configuration>