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:10 UTC
[28/45] ambari git commit: AMBARI-20747 - Upgrade is not taking care
of AMBARI-15677 (jonathanhurley)
AMBARI-20747 - Upgrade is not taking care of AMBARI-15677 (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/84d2b3a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84d2b3a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84d2b3a0
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 84d2b3a0ac3256d7d10c550d94814db3602f9ed7
Parents: 04f3110
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu Apr 20 16:44:52 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Apr 21 09:22:51 2017 -0400
----------------------------------------------------------------------
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 7 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 7 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 5 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 5 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 5 +
.../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 6 +
.../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 1 +
.../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 1 +
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 6 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 5 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 4 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 +-
.../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 6 +
.../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 1 +
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 250 ++++++++++---------
.../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 5 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 6 +
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 6 +
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
24 files changed, 220 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 63cf5f5..ffa8e61 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -386,6 +386,13 @@
<regex-replace key="content" find="hadoop.security.log.file=SecurityAuth.audit" replace-with="hadoop.security.log.file=SecurityAuth.audit log4j.additivity.SecurityLogger=false"/>
<regex-replace key="content" find="log4j.additivity.SecurityLogger=true" replace-with="log4j.additivity.SecurityLogger=false"/>
</definition>
+
+ <definition xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics" summary="Prevent Garbage Collection Heuristics">
+ <type>hadoop-env</type>
+ <replace key="content" find="-XX:+PrintGCDateStamps -Xms{{namenode_heapsize}}" replace-with="-XX:+PrintGCDateStamps -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly -Xms{{namenode_heapsize}}"/>
+ <replace key="content" find="-XX:+PrintGCDateStamps ${HADOOP_NAMENODE_INIT_HEAPSIZE}" replace-with="-XX:+PrintGCDateStamps -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly ${HADOOP_NAMENODE_INIT_HEAPSIZE}"/>
+ </definition>
+
</changes>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
index 3d8041e..e111dbf 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
@@ -253,6 +253,11 @@
<direction>UPGRADE</direction> <!-- prevent config changes on downgrade -->
<skippable>true</skippable> <!-- May fix configuration problems manually -->
+ <!-- HDFS -->
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
@@ -292,6 +297,8 @@
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus">
<task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/>
</execute-stage>
+
+
</group>
<!--
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
index fa06291..6230921 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
@@ -264,6 +264,11 @@
</task>
</execute-stage>
+ <!-- HDFS -->
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!-- YARN -->
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
index 8b8b9a6..44367dc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
@@ -285,6 +285,11 @@
</task>
</execute-stage>
+ <!-- HDFS -->
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!-- YARN -->
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index 2bf6e23..9362ae6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -297,6 +297,11 @@
<task xsi:type="configure" id="hdfs_securitylogger_additivity"/>
</execute-stage>
+ <!-- HDFS -->
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!-- YARN -->
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
index 97904bf..19031a8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
@@ -547,6 +547,12 @@
<service name="HDFS">
<component name="NAMENODE">
+ <pre-upgrade>
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </pre-upgrade>
+
+ <pre-downgrade/>
+
<upgrade>
<task xsi:type="restart-task" timeout-config="upgrade.parameter.nn-restart.timeout"/>
</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
index fd75e49..8cfaa52 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
@@ -574,6 +574,7 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments"/>
<task xsi:type="configure" id="hdfs_log4j_parameterize" />
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
index 5318a51..6981955 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
@@ -673,6 +673,7 @@
<task xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments"/>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db" />
<task xsi:type="configure" id="hdfs_log4j_parameterize" />
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index d2e6288..0440dd3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -682,6 +682,7 @@
<task xsi:type="configure" id="hdfs_log4j_parameterize" />
<task xsi:type="configure" id="hadoop_env_zkfc_security_opts" />
<task xsi:type="configure" id="hdfs_securitylogger_additivity" />
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
index 2345d08..f99e764 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
@@ -271,6 +271,12 @@
<regex-replace key="content" find="hadoop.security.log.file=SecurityAuth.audit" replace-with="hadoop.security.log.file=SecurityAuth.audit log4j.additivity.SecurityLogger=false"/>
<regex-replace key="content" find="log4j.additivity.SecurityLogger=true" replace-with="log4j.additivity.SecurityLogger=false"/>
</definition>
+
+ <definition xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics" summary="Prevent Garbage Collection Heuristics">
+ <type>hadoop-env</type>
+ <replace key="content" find="-XX:+PrintGCDateStamps -Xms{{namenode_heapsize}}" replace-with="-XX:+PrintGCDateStamps -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly -Xms{{namenode_heapsize}}"/>
+ <replace key="content" find="-XX:+PrintGCDateStamps ${HADOOP_NAMENODE_INIT_HEAPSIZE}" replace-with="-XX:+PrintGCDateStamps -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly ${HADOOP_NAMENODE_INIT_HEAPSIZE}"/>
+ </definition>
</changes>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
index 13f44fb..5120740 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
@@ -251,6 +251,11 @@
<direction>UPGRADE</direction> <!-- prevent config changes on downgrade -->
<skippable>true</skippable> <!-- May fix configuration problems manually -->
+ <!-- HDFS -->
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
index ea261b9..3a42876 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
@@ -379,6 +379,10 @@
</task>
</execute-stage>
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!-- SQOOP -->
<execute-stage service="SQOOP" component="SQOOP" title="Apply config changes for Sqoop to remove Atlas Configs">
<!-- Remove Atlas configs that were incorrectly added to sqoop-site instead of Atlas' application.properties. -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
index de6b8ef..b812547 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
@@ -435,20 +435,22 @@
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db"/>
</execute-stage>
- <!--HDFS-->
<execute-stage service="HDFS" component="NAMENODE" title="Parameterizing Hdfs Log4J Properties">
<task xsi:type="configure" id="hdfs_log4j_parameterize">
<summary>Updating the Hdfs Log4J properties to include parameterizations</summary>
</task>
</execute-stage>
- <!--HDFS-->
<execute-stage service="HDFS" component="NAMENODE" title="Adding HDFS ZKFC Security ACLs">
<task xsi:type="configure" id="hadoop_env_zkfc_security_opts">
<summary>Adding HDFS ZKFC Security ACLs</summary>
</task>
</execute-stage>
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!--SPARK-->
<execute-stage service="SPARK" component="SPARK_CLIENT" title="Apply config changes for Spark">
<task xsi:type="configure" id="hdp_2_5_0_0_spark_yarn_queue">
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
index fba7093..80436bf 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
@@ -523,6 +523,12 @@
<service name="HDFS">
<component name="NAMENODE">
+ <pre-upgrade>
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </pre-upgrade>
+
+ <pre-downgrade/>
+
<upgrade>
<task xsi:type="restart-task" timeout-config="upgrade.parameter.nn-restart.timeout"/>
</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
index 68efed2..5034627 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
@@ -673,6 +673,7 @@
<task xsi:type="configure" id="hdp_2_5_0_0_namenode_ha_adjustments"/>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db" />
<task xsi:type="configure" id="hdfs_log4j_parameterize" />
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
index 2ed7962..fbd61ea 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
@@ -687,6 +687,7 @@
<task xsi:type="configure" id="hdfs_log4j_parameterize" />
<task xsi:type="configure" id="hadoop_env_zkfc_security_opts" />
<task xsi:type="configure" id="hdfs_securitylogger_additivity" />
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index ad936c2..1c2ceff 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -159,115 +159,121 @@
</changes>
</component>
</service>
- <service name="OOZIE">
- <component name="OOZIE_SERVER">
- <changes>
- <!-- Oozie Rolling properties for log4j need to be parameterized. -->
- <definition xsi:type="configure" id="oozie_log4j_parameterize" summary="Parameterizing Oozie Log4J Properties">
- <type>oozie-log4j</type>
- <set key="oozie_log_maxhistory" value="720"/>
- <regex-replace key="content" find="^log4j.appender.oozie.RollingPolicy.MaxHistory=([0-9]+)" replace-with="log4j.appender.oozie.RollingPolicy.MaxHistory={{oozie_log_maxhistory}}"/>
- </definition>
- </changes>
- </component>
- </service>
- <service name="YARN">
- <component name="RESOURCEMANAGER">
- <changes>
- <!-- Yarn Rolling properties for log4j need to be parameterized. -->
- <definition xsi:type="configure" id="yarn_log4j_parameterize" summary="Parameterizing Yarn Log4J Properties">
- <type>yarn-log4j</type>
- <set key="yarn_rm_summary_log_max_backup_size" value="256"/>
- <set key="yarn_rm_summary_log_number_of_backup_files" value="20"/>
- <regex-replace key="content" find="^log4j.appender.RMSUMMARY.MaxFileSize=([0-9]+)MB" replace-with="log4j.appender.RMSUMMARY.MaxFileSize={{yarn_rm_summary_log_max_backup_size}}MB"/>
- <regex-replace key="content" find="^log4j.appender.RMSUMMARY.MaxBackupIndex=([0-9]+)" replace-with="log4j.appender.RMSUMMARY.MaxBackupIndex={{yarn_rm_summary_log_number_of_backup_files}}"/>
- </definition>
- <definition xsi:type="configure" id="yarn_env_security_opts" summary="Adding YARN Security ACLs">
- <type>yarn-env</type>
- <insert key="content" value="{% if rm_security_opts is defined %} YARN_OPTS="{{rm_security_opts}} $YARN_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" />
- </definition>
- <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption">
- <type>yarn-site</type>
- <transfer operation="copy"
- from-key="yarn.resourcemanager.scheduler.monitor.enable"
- to-key="yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled"
- default-value="false"/>
- </definition>
- <definition xsi:type="configure" id="yarn_site_retained_log_count" summary="Updating Yarn retained file count for continuous Log Aggregation">
- <type>yarn-site</type>
- <set key="yarn.nodemanager.log-aggregation.num-log-files-per-app"
- value="336" />
- </definition>
- <definition xsi:type="configure" id="hdp_2_6_0_0_service_check_queue_name">
- <type>yarn-env</type>
- <set key="service_check.queue.name" value="default" if-type="yarn-env" if-key="service_check.queue.name" if-key-state="absent"/>
- </definition>
- <definition xsi:type="configure" id="hdp_2_6_0_0_ats_scan_interval_default">
- <type>yarn-site</type>
- <set key="yarn.timeline-service.entity-group-fs-store.scan-interval-seconds" value="15"
- if-type="yarn-site" if-key="yarn.timeline-service.entity-group-fs-store.scan-interval-seconds" if-value="60"/>
- </definition>
- </changes>
- </component>
- </service>
+ <service name="OOZIE">
+ <component name="OOZIE_SERVER">
+ <changes>
+ <!-- Oozie Rolling properties for log4j need to be parameterized. -->
+ <definition xsi:type="configure" id="oozie_log4j_parameterize" summary="Parameterizing Oozie Log4J Properties">
+ <type>oozie-log4j</type>
+ <set key="oozie_log_maxhistory" value="720"/>
+ <regex-replace key="content" find="^log4j.appender.oozie.RollingPolicy.MaxHistory=([0-9]+)" replace-with="log4j.appender.oozie.RollingPolicy.MaxHistory={{oozie_log_maxhistory}}"/>
+ </definition>
+ </changes>
+ </component>
+ </service>
+ <service name="YARN">
+ <component name="RESOURCEMANAGER">
+ <changes>
+ <!-- Yarn Rolling properties for log4j need to be parameterized. -->
+ <definition xsi:type="configure" id="yarn_log4j_parameterize" summary="Parameterizing Yarn Log4J Properties">
+ <type>yarn-log4j</type>
+ <set key="yarn_rm_summary_log_max_backup_size" value="256"/>
+ <set key="yarn_rm_summary_log_number_of_backup_files" value="20"/>
+ <regex-replace key="content" find="^log4j.appender.RMSUMMARY.MaxFileSize=([0-9]+)MB" replace-with="log4j.appender.RMSUMMARY.MaxFileSize={{yarn_rm_summary_log_max_backup_size}}MB"/>
+ <regex-replace key="content" find="^log4j.appender.RMSUMMARY.MaxBackupIndex=([0-9]+)" replace-with="log4j.appender.RMSUMMARY.MaxBackupIndex={{yarn_rm_summary_log_number_of_backup_files}}"/>
+ </definition>
+ <definition xsi:type="configure" id="yarn_env_security_opts" summary="Adding YARN Security ACLs">
+ <type>yarn-env</type>
+ <insert key="content" value="{% if rm_security_opts is defined %} YARN_OPTS="{{rm_security_opts}} $YARN_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" />
+ </definition>
+ <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption">
+ <type>yarn-site</type>
+ <transfer operation="copy"
+ from-key="yarn.resourcemanager.scheduler.monitor.enable"
+ to-key="yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled"
+ default-value="false"/>
+ </definition>
+ <definition xsi:type="configure" id="yarn_site_retained_log_count" summary="Updating Yarn retained file count for continuous Log Aggregation">
+ <type>yarn-site</type>
+ <set key="yarn.nodemanager.log-aggregation.num-log-files-per-app"
+ value="336" />
+ </definition>
+ <definition xsi:type="configure" id="hdp_2_6_0_0_service_check_queue_name">
+ <type>yarn-env</type>
+ <set key="service_check.queue.name" value="default" if-type="yarn-env" if-key="service_check.queue.name" if-key-state="absent"/>
+ </definition>
+ <definition xsi:type="configure" id="hdp_2_6_0_0_ats_scan_interval_default">
+ <type>yarn-site</type>
+ <set key="yarn.timeline-service.entity-group-fs-store.scan-interval-seconds" value="15"
+ if-type="yarn-site" if-key="yarn.timeline-service.entity-group-fs-store.scan-interval-seconds" if-value="60"/>
+ </definition>
+ </changes>
+ </component>
+ </service>
- <service name="MAPREDUCE2">
- <component name="MAPREDUCE2_CLIENT">
- <changes>
- <definition xsi:type="configure" id="hdp_2_6_0_0_mapreduce_job_queuename">
- <type>mapred-site</type>
- <set key="mapreduce.job.queuename" value="default" if-type="mapred-site" if-key="mapreduce.job.queuename" if-key-state="absent"/>
- </definition>
- </changes>
- </component>
- </service>
+ <service name="MAPREDUCE2">
+ <component name="MAPREDUCE2_CLIENT">
+ <changes>
+ <definition xsi:type="configure" id="hdp_2_6_0_0_mapreduce_job_queuename">
+ <type>mapred-site</type>
+ <set key="mapreduce.job.queuename" value="default" if-type="mapred-site" if-key="mapreduce.job.queuename" if-key-state="absent"/>
+ </definition>
+ </changes>
+ </component>
+ </service>
- <service name="HDFS">
- <component name="NAMENODE">
+ <service name="HDFS">
+ <component name="NAMENODE">
+ <changes>
+ <!-- HDFS Rolling properties for log4j need to be parameterized. -->
+ <definition xsi:type="configure" id="hdfs_log4j_parameterize" summary="Parameterizing Hdfs Log4J Properties">
+ <type>hdfs-log4j</type>
+ <set key="hadoop_log_max_backup_size" value="256"/>
+ <set key="hadoop_log_number_of_backup_files" value="10"/>
+ <set key="hadoop_security_log_max_backup_size" value="256"/>
+ <set key="hadoop_security_log_number_of_backup_files" value="20"/>
+ <regex-replace key="content" find="log4j.appender.RFA.MaxFileSize=([0-9]+)MB" replace-with="log4j.appender.RFA.MaxFileSize={{hadoop_log_max_backup_size}}MB"/>
+ <regex-replace key="content" find="log4j.appender.RFA.MaxBackupIndex=([0-9]+)" replace-with="log4j.appender.RFA.MaxBackupIndex={{hadoop_log_number_of_backup_files}}"/>
+ <regex-replace key="content" find="hadoop.security.log.maxfilesize=([0-9]+)MB" replace-with="hadoop.security.log.maxfilesize={{hadoop_security_log_max_backup_size}}MB"/>
+ <regex-replace key="content" find="hadoop.security.log.maxbackupindex=([0-9]+)" replace-with="hadoop.security.log.maxbackupindex={{hadoop_security_log_number_of_backup_files}}"/>
+ </definition>
+ <definition xsi:type="configure" id="hadoop_env_zkfc_security_opts" summary="Adding HDFS ZKFC Security ACLs">
+ <type>hadoop-env</type>
+ <insert key="content" value="{% if hadoop_zkfc_opts is defined %} export HADOOP_ZKFC_OPTS="{{hadoop_zkfc_opts}} $HADOOP_ZKFC_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" />
+ </definition>
+ <definition xsi:type="configure" id="hdfs_securitylogger_additivity" summary="Set additivity of SecurityLogger to false">
+ <type>hdfs-log4j</type>
+ <regex-replace key="content" find="hadoop.security.log.file=SecurityAuth.audit" replace-with="hadoop.security.log.file=SecurityAuth.audit log4j.additivity.SecurityLogger=false"/>
+ <regex-replace key="content" find="log4j.additivity.SecurityLogger=true" replace-with="log4j.additivity.SecurityLogger=false"/>
+ </definition>
+
+ <definition xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics" summary="Prevent Garbage Collection Heuristics">
+ <type>hadoop-env</type>
+ <replace key="content" find="-XX:+PrintGCDateStamps -Xms{{namenode_heapsize}}" replace-with="-XX:+PrintGCDateStamps -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly -Xms{{namenode_heapsize}}"/>
+ <replace key="content" find="-XX:+PrintGCDateStamps ${HADOOP_NAMENODE_INIT_HEAPSIZE}" replace-with="-XX:+PrintGCDateStamps -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly ${HADOOP_NAMENODE_INIT_HEAPSIZE}"/>
+ </definition>
+ </changes>
+ </component>
+ </service>
+ <service name="HBASE">
+ <component name="HBASE_MASTER">
<changes>
- <!-- HDFS Rolling properties for log4j need to be parameterized. -->
- <definition xsi:type="configure" id="hdfs_log4j_parameterize" summary="Parameterizing Hdfs Log4J Properties">
- <type>hdfs-log4j</type>
- <set key="hadoop_log_max_backup_size" value="256"/>
- <set key="hadoop_log_number_of_backup_files" value="10"/>
- <set key="hadoop_security_log_max_backup_size" value="256"/>
- <set key="hadoop_security_log_number_of_backup_files" value="20"/>
- <regex-replace key="content" find="log4j.appender.RFA.MaxFileSize=([0-9]+)MB" replace-with="log4j.appender.RFA.MaxFileSize={{hadoop_log_max_backup_size}}MB"/>
- <regex-replace key="content" find="log4j.appender.RFA.MaxBackupIndex=([0-9]+)" replace-with="log4j.appender.RFA.MaxBackupIndex={{hadoop_log_number_of_backup_files}}"/>
- <regex-replace key="content" find="hadoop.security.log.maxfilesize=([0-9]+)MB" replace-with="hadoop.security.log.maxfilesize={{hadoop_security_log_max_backup_size}}MB"/>
- <regex-replace key="content" find="hadoop.security.log.maxbackupindex=([0-9]+)" replace-with="hadoop.security.log.maxbackupindex={{hadoop_security_log_number_of_backup_files}}"/>
- </definition>
- <definition xsi:type="configure" id="hadoop_env_zkfc_security_opts" summary="Adding HDFS ZKFC Security ACLs">
- <type>hadoop-env</type>
- <insert key="content" value="{% if hadoop_zkfc_opts is defined %} export HADOOP_ZKFC_OPTS="{{hadoop_zkfc_opts}} $HADOOP_ZKFC_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" />
- </definition>
- <definition xsi:type="configure" id="hdfs_securitylogger_additivity" summary="Set additivity of SecurityLogger to false">
- <type>hdfs-log4j</type>
- <regex-replace key="content" find="hadoop.security.log.file=SecurityAuth.audit" replace-with="hadoop.security.log.file=SecurityAuth.audit log4j.additivity.SecurityLogger=false"/>
- <regex-replace key="content" find="log4j.additivity.SecurityLogger=true" replace-with="log4j.additivity.SecurityLogger=false"/>
+ <!-- HBase Rolling properties for log4j need to be parameterized. -->
+ <definition xsi:type="configure" id="hbase_log4j_parameterize" summary="Parameterizing HBase Log4J Properties">
+ <type>hbase-log4j</type>
+ <set key="hbase_log_maxfilesize" value="256"/>
+ <set key="hbase_log_maxbackupindex" value="20"/>
+ <set key="hbase_security_log_maxfilesize" value="256"/>
+ <set key="hbase_security_log_maxbackupindex" value="20"/>
+ <regex-replace key="content" find="hbase.log.maxfilesize=([0-9]+)MB" replace-with="hbase.log.maxfilesize={{hbase_log_maxfilesize}}MB"/>
+ <regex-replace key="content" find="hbase.log.maxbackupindex=([0-9]+)" replace-with="hbase.log.maxbackupindex={{hbase_log_maxbackupindex}}"/>
+ <regex-replace key="content" find="hbase.security.log.maxfilesize=([0-9]+)MB" replace-with="hbase.security.log.maxfilesize={{hbase_security_log_maxfilesize}}MB"/>
+ <regex-replace key="content" find="hbase.security.log.maxbackupindex=([0-9]+)" replace-with="hbase.security.log.maxbackupindex={{hbase_security_log_maxbackupindex}}"/>
</definition>
</changes>
- </component>
- </service>
- <service name="HBASE">
- <component name="HBASE_MASTER">
- <changes>
- <!-- HBase Rolling properties for log4j need to be parameterized. -->
- <definition xsi:type="configure" id="hbase_log4j_parameterize" summary="Parameterizing HBase Log4J Properties">
- <type>hbase-log4j</type>
- <set key="hbase_log_maxfilesize" value="256"/>
- <set key="hbase_log_maxbackupindex" value="20"/>
- <set key="hbase_security_log_maxfilesize" value="256"/>
- <set key="hbase_security_log_maxbackupindex" value="20"/>
- <regex-replace key="content" find="hbase.log.maxfilesize=([0-9]+)MB" replace-with="hbase.log.maxfilesize={{hbase_log_maxfilesize}}MB"/>
- <regex-replace key="content" find="hbase.log.maxbackupindex=([0-9]+)" replace-with="hbase.log.maxbackupindex={{hbase_log_maxbackupindex}}"/>
- <regex-replace key="content" find="hbase.security.log.maxfilesize=([0-9]+)MB" replace-with="hbase.security.log.maxfilesize={{hbase_security_log_maxfilesize}}MB"/>
- <regex-replace key="content" find="hbase.security.log.maxbackupindex=([0-9]+)" replace-with="hbase.security.log.maxbackupindex={{hbase_security_log_maxbackupindex}}"/>
- </definition>
- </changes>
- </component>
- </service>
- <service name="FALCON">
+ </component>
+ </service>
+ <service name="FALCON">
<component name="FALCON_SERVER">
<changes>
<definition xsi:type="configure" id="falcon_log4j_parameterize" summary="Parameterizing Falcon Log4J Properties">
@@ -371,24 +377,24 @@
</component>
</service>
<service name="KNOX">
- <component name="KNOX_GATEWAY">
- <changes>
- <definition xsi:type="configure" id="knox_gateway_log4j_parameterize" summary="Parameterizing Knox Gateway Log4J Properties">
- <type>gateway-log4j</type>
- <set key="knox_gateway_log_maxfilesize" value="256"/>
- <set key="knox_gateway_log_maxbackupindex" value="20"/>
- <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxFileSize = {{knox_gateway_log_maxfilesize}}MB"/>
- <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxBackupIndex = {{knox_gateway_log_maxbackupindex}}"/>
- </definition>
- <definition xsi:type="configure" id="knox_ldap_log4j_parameterize" summary="Parameterizing Knox Ldap Log4J Properties">
- <type>ldap-log4j</type>
- <set key="knox_ldap_log_maxfilesize" value="256"/>
- <set key="knox_ldap_log_maxbackupindex" value="20"/>
- <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxFileSize = {{knox_ldap_log_maxfilesize}}MB"/>
- <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxBackupIndex = {{knox_ldap_log_maxbackupindex}}"/>
- </definition>
- </changes>
- </component>
+ <component name="KNOX_GATEWAY">
+ <changes>
+ <definition xsi:type="configure" id="knox_gateway_log4j_parameterize" summary="Parameterizing Knox Gateway Log4J Properties">
+ <type>gateway-log4j</type>
+ <set key="knox_gateway_log_maxfilesize" value="256"/>
+ <set key="knox_gateway_log_maxbackupindex" value="20"/>
+ <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxFileSize = {{knox_gateway_log_maxfilesize}}MB"/>
+ <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxBackupIndex = {{knox_gateway_log_maxbackupindex}}"/>
+ </definition>
+ <definition xsi:type="configure" id="knox_ldap_log4j_parameterize" summary="Parameterizing Knox Ldap Log4J Properties">
+ <type>ldap-log4j</type>
+ <set key="knox_ldap_log_maxfilesize" value="256"/>
+ <set key="knox_ldap_log_maxbackupindex" value="20"/>
+ <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxFileSize = {{knox_ldap_log_maxfilesize}}MB"/>
+ <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxBackupIndex = {{knox_ldap_log_maxbackupindex}}"/>
+ </definition>
+ </changes>
+ </component>
</service>
<service name="PIG">
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
index d5387c6..be8b750 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
@@ -271,6 +271,11 @@
<direction>UPGRADE</direction> <!-- prevent config changes on downgrade -->
<skippable>true</skippable> <!-- May fix configuration problems manually -->
+ <!-- HDFS -->
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index d46353e..d822778 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -281,6 +281,10 @@
<task xsi:type="configure" id="hdfs_securitylogger_additivity"/>
</execute-stage>
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
index 1af96dd..210c4e2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
@@ -573,6 +573,12 @@
<service name="HDFS">
<component name="NAMENODE">
+ <pre-upgrade>
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </pre-upgrade>
+
+ <pre-downgrade/>
+
<upgrade>
<task xsi:type="restart-task" timeout-config="upgrade.parameter.nn-restart.timeout"/>
</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 94aab48..9a06dd0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -616,6 +616,7 @@
<task xsi:type="configure" id="hdfs_log4j_parameterize" />
<task xsi:type="configure" id="hadoop_env_zkfc_security_opts" />
<task xsi:type="configure" id="hdfs_securitylogger_additivity" />
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
</pre-upgrade>
<pre-downgrade />
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/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 ceed59b..87646fa 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
@@ -38,6 +38,12 @@
<set key="ranger.plugin.hdfs.ambari.cluster.name" value="{{cluster_name}}"
if-type="ranger-hdfs-plugin-properties" if-key="ranger-hdfs-plugin-enabled" if-key-state="present"/>
</definition>
+
+ <definition xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics" summary="Prevent Garbage Collection Heuristics">
+ <type>hadoop-env</type>
+ <replace key="content" find="-XX:+PrintGCDateStamps -Xms{{namenode_heapsize}}" replace-with="-XX:+PrintGCDateStamps -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly -Xms{{namenode_heapsize}}"/>
+ <replace key="content" find="-XX:+PrintGCDateStamps ${HADOOP_NAMENODE_INIT_HEAPSIZE}" replace-with="-XX:+PrintGCDateStamps -XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly ${HADOOP_NAMENODE_INIT_HEAPSIZE}"/>
+ </definition>
</changes>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/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 ce07f7a..7f0c818 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
@@ -294,6 +294,10 @@
<task xsi:type="configure" id="hdp_2_6_maint_ranger_hdfs_plugin_cluster_name"/>
</execute-stage>
+ <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics">
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
+ </execute-stage>
+
<!-- HIVE -->
<execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes for Ranger Hive plugin">
<task xsi:type="configure" id="hdp_2_6_maint_ranger_hive_plugin_cluster_name"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84d2b3a0/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 5b8f53b..7279870 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
@@ -607,6 +607,7 @@
<component name="NAMENODE">
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_6_maint_ranger_hdfs_plugin_cluster_name"/>
+ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/>
</pre-upgrade>
<pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<upgrade>