You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/04/24 02:21:21 UTC
[39/45] ambari git commit: AMBARI-20824. Add two new preemption
properties to RU/EE (ncole)
AMBARI-20824. Add two new preemption properties to RU/EE (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12ee39f3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12ee39f3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12ee39f3
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 12ee39f340e1ca8d7ef285b21a19d28f1f9e17ae
Parents: df4706e
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Apr 21 16:52:34 2017 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Apr 21 16:52:34 2017 -0400
----------------------------------------------------------------------
.../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 11 +++++++++++
.../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 ++++
.../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
3 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/12ee39f3/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 87646fa..f5d87e9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -104,6 +104,17 @@
<set key="ranger.plugin.yarn.ambari.cluster.name" value="{{cluster_name}}"
if-type="ranger-yarn-plugin-properties" if-key="ranger-yarn-plugin-enabled" if-key-state="present"/>
</definition>
+ <definition xsi:type="configure" id="hdp_2_6_yarn_preemption" summary="Resource Manager Preemption Settings">
+ <type>yarn-site</type>
+ <set key="yarn.resourcemanager.monitor.capacity.preemption.total_preemption_per_round" value="0.1"
+ if-type="yarn-site"
+ if-key="yarn.resourcemanager.monitor.capacity.preemption.total_preemption_per_round"
+ if-key-state="absent" />
+ <set key="yarn.resourcemanager.monitor.capacity.preemption.natural_termination_factor" value="1"
+ if-type="yarn-site"
+ if-key="yarn.resourcemanager.monitor.capacity.preemption.natural_termination_factor"
+ if-key-state="absent" />
+ </definition>
</changes>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/12ee39f3/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index 7f0c818..f7c276b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
@@ -322,6 +322,10 @@
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for Ranger Yarn plugin">
<task xsi:type="configure" id="hdp_2_6_maint_ranger_yarn_plugin_cluster_name"/>
</execute-stage>
+
+ <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for YARN Preemption">
+ <task xsi:type="configure" id="hdp_2_6_yarn_preemption"/>
+ </execute-stage>
<!-- KAFKA -->
<execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes for Ranger Kafka plugin">
http://git-wip-us.apache.org/repos/asf/ambari/blob/12ee39f3/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
index 7279870..81757c1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
@@ -686,6 +686,7 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_6_maint_ranger_yarn_plugin_cluster_name"/>
+ <task xsi:type="configure" id="hdp_2_6_yarn_preemption" />
</pre-upgrade>
<pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<upgrade>