Repository: ambari Updated Branches: refs/heads/branch-2.5 d1d58ad8e -> 99f923889
AMBARI-20284. Fix values of ATS config params for HDP stack (smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99f92388 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99f92388 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99f92388 Branch: refs/heads/branch-2.5 Commit: 99f9238895b5cab888eb8b478eba5dfa53382c49 Parents: d1d58ad Author: Sumit Mohanty <[email protected]> Authored: Fri Mar 3 13:23:45 2017 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Fri Mar 3 13:25:17 2017 -0800 ---------------------------------------------------------------------- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 ++++ .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 +++++ .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 ++++ .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 +++++ .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 5 ++++ .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 +++++ .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 + .../services/YARN/configuration/yarn-site.xml | 28 ++++++++++++++++++++ 10 files changed, 64 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/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 000e902..96a95fb 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 @@ -522,6 +522,11 @@ <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> http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/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 7c9fb67..40ef43d 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 @@ -332,6 +332,12 @@ </task> </execute-stage> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for ATS SCAN"> + <task xsi:type="configure" id="hdp_2_6_0_0_ats_scan_interval_default"> + <summary>Modifying ATS Scan default</summary> + </task> + </execute-stage> + <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"> <summary>Verifying LZO codec path for mapreduce</summary> http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/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 9f3f42d..fb5e584 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 @@ -756,6 +756,7 @@ <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="hdp_2_6_0_0_service_check_queue_name"/> + <task xsi:type="configure" id="hdp_2_6_0_0_ats_scan_interval_default"/> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/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 8b00b05..8ab88b8 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 @@ -301,6 +301,11 @@ <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> http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/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 c2e185d..d5a7c68 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 @@ -307,6 +307,12 @@ </task> </execute-stage> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for ATS SCAN"> + <task xsi:type="configure" id="hdp_2_6_0_0_ats_scan_interval_default"> + <summary>Modifying ATS Scan default</summary> + </task> + </execute-stage> + <execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client"> <task xsi:type="configure" id="hdp_2_6_0_0_mapreduce_job_queuename"> <summary>Adding queue customization property</summary> http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/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 edc227a..e11ff02 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 @@ -761,6 +761,7 @@ <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="hdp_2_6_0_0_service_check_queue_name"/> + <task xsi:type="configure" id="hdp_2_6_0_0_ats_scan_interval_default"/> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/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 da036cf..93e0149 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 @@ -179,6 +179,11 @@ <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> http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/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 f232118..55e8924 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 @@ -316,6 +316,12 @@ </task> </execute-stage> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for ATS SCAN"> + <task xsi:type="configure" id="hdp_2_6_0_0_ats_scan_interval_default"> + <summary>Modifying ATS Scan default</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"> http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/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 f0a4f05..0c0b08e 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 @@ -688,6 +688,7 @@ <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" /> <task xsi:type="configure" id="hdp_2_6_0_0_service_check_queue_name"/> + <task xsi:type="configure" id="hdp_2_6_0_0_ats_scan_interval_default"/> </pre-upgrade> <pre-downgrade /> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/99f92388/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml index 70a2cbe..4b97148 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml @@ -35,4 +35,32 @@ </depends-on> <on-ambari-upgrade add="false"/> </property> + <property> + <name>yarn.timeline-service.entity-group-fs-store.app-cache-size</name> + <value>10</value> + <description> + Size of the reader cache for ATS reader. This value controls how many entity groups the ATS server should cache. + If the number of active read entity groups is greater than the number of caches items, some reads may return empty data. + This value must be greater than 0. + </description> + <on-ambari-upgrade add="false"/> + </property> + <property> + <name>yarn.timeline-service.client.fd-flush-interval-secs</name> + <value>5</value> + <description> + Flush interval for ATS writer. This value controls how frequent the writer will flush the DFS FSStream for the entity/domain. + </description> + <on-ambari-upgrade add="false"/> + </property> + <property> + <name>yarn.timeline-service.entity-group-fs-store.scan-interval-seconds</name> + <value>15</value> + <description> + Scan interval for ATS entity group file system storage reader.This + value controls how frequent the reader will scan the DFS active directory + for application status. + </description> + <on-ambari-upgrade add="false"/> + </property> </configuration>
