Repository: ambari Updated Branches: refs/heads/branch-2.5 7ba0bdd8a -> 99ba00ab3
AMBARI-19884. Set a higher value of num aggregated files per container - HDP stack, YARN (Siddharth Seth via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99ba00ab Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99ba00ab Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99ba00ab Branch: refs/heads/branch-2.5 Commit: 99ba00ab374c655b753252ee8a96c559f72e84d1 Parents: 7ba0bdd Author: Sumit Mohanty <[email protected]> Authored: Sat Feb 11 16:09:15 2017 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Sat Feb 11 16:09:15 2017 -0800 ---------------------------------------------------------------------- .../HDP/2.5/services/YARN/configuration/yarn-site.xml | 6 ++++++ .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 5 +++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 9 ++++++++- .../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/99ba00ab/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml index 90b2243..b6fadcb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml @@ -47,6 +47,12 @@ <on-ambari-upgrade add="false"/> </property> <property> + <name>yarn.nodemanager.log-aggregation.num-log-files-per-app</name> + <value>336</value> + <description>The number of files to retain per container when continuous log aggregation is used</description> + <on-ambari-upgrade add="false"/> + </property> + <property> <name>yarn.nodemanager.container-metrics.unregister-delay-ms</name> <value>60000</value> <description>The delay time ms to unregister container metrics after completion.</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/99ba00ab/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 2bbc84e..23564ad 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 @@ -139,6 +139,11 @@ 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> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/99ba00ab/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 1be4165..75515a5 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 @@ -299,12 +299,19 @@ </execute-stage> <!--Yarn--> - <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for Resource Manager"> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for underutilized_preemption"> <task xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption"> <summary>Updating underutilized_preemption setting</summary> </task> </execute-stage> + <!--Yarn--> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for YARN app log retaintion"> + <task xsi:type="configure" id="yarn_site_retained_log_count"> + <summary>Updating log aggregation retained files setting</summary> + </task> + </execute-stage> + <!--TEZ--> <execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"> http://git-wip-us.apache.org/repos/asf/ambari/blob/99ba00ab/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 bc68754..b83525a 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 @@ -670,6 +670,7 @@ <task xsi:type="configure" id="yarn_log4j_parameterize" /> <task xsi:type="configure" id="yarn_env_security_opts" /> <task xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption" /> + <task xsi:type="configure" id="yarn_site_retained_log_count" /> </pre-upgrade> <pre-downgrade /> <upgrade>
