You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2017/02/18 00:35:51 UTC
ambari git commit: AMBARI-20072. Add heap dump option for tez-site
config 'tez.am.launch.cmd-opts'.
Repository: ambari
Updated Branches:
refs/heads/trunk f2cb1b6ef -> 7cde24ed7
AMBARI-20072. Add heap dump option for tez-site config 'tez.am.launch.cmd-opts'.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7cde24ed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7cde24ed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7cde24ed
Branch: refs/heads/trunk
Commit: 7cde24ed7eb410073b1e76819c54e600e0e6317f
Parents: f2cb1b6
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Fri Feb 17 12:11:49 2017 -0800
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Fri Feb 17 16:35:09 2017 -0800
----------------------------------------------------------------------
.../main/resources/stacks/HDP/2.3/services/stack_advisor.py | 2 +-
.../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 6 +++++-
.../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 8 ++++++--
.../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 3 ++-
.../main/resources/stacks/HDP/2.6/services/stack_advisor.py | 4 +++-
5 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7cde24ed/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 30cbc7c..ee83be7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -136,9 +136,9 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
versionSplits = re.split("\.", match.group(1))
if versionSplits and len(versionSplits) > 1 and int(versionSplits[0]) > 0 and int(versionSplits[1]) > 7:
jvmGCParams = "-XX:+UseG1GC -XX:+ResizeTLAB"
- putTezProperty('tez.am.launch.cmd-opts', "-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA " + jvmGCParams)
# Note: Same calculation is done in 2.6/stack_advisor::recommendTezConfigurations() for 'tez.task.launch.cmd-opts',
# and along with it, are appended heap dump opts. If something changes here, make sure to change it in 2.6 stack.
+ putTezProperty('tez.am.launch.cmd-opts', "-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA " + jvmGCParams)
putTezProperty('tez.task.launch.cmd-opts', "-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA " + jvmGCParams)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7cde24ed/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 7236186..24f3f78 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
@@ -336,10 +336,14 @@
<type>hive-env</type>
<insert key="content" value="export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS{{heap_dump_opts}}"" insert-type="append" newline-before="true" newline-after="true" />
</definition>
- <definition xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options">
+ <definition xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options_for_tez_task">
<type>tez-site</type>
<insert key="tez.task.launch.cmd-opts" value="{{heap_dump_opts}}" insert-type="append" newline-before="false" newline-after="false" />
</definition>
+ <definition xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options_for_tez_am">
+ <type>tez-site</type>
+ <insert key="tez.am.launch.cmd-opts" value="{{heap_dump_opts}}" insert-type="append" newline-before="false" newline-after="false" />
+ </definition>
<definition xsi:type="configure" id="hive_log4j_parameterize" summary="Parameterizing Hive Log4J Properties">
<type>hive-log4j</type>
<set key="hive_log_maxfilesize" value="256"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7cde24ed/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 bb9ec1b..5614915 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
@@ -470,8 +470,12 @@
<task xsi:type="configure" id="hdp_2_6_0_0_hive_append_heap_dump_options"/>
</execute-stage>
- <execute-stage service="HIVE" component="HIVE_SERVER" title="Appending heap dump options for Tez">
- <task xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options"/>
+ <execute-stage service="HIVE" component="HIVE_SERVER" title="Appending heap dump options for Tez config 'tez.task.launch.cmd-opts'">
+ <task xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options_for_tez_task"/>
+ </execute-stage>
+
+ <execute-stage service="HIVE" component="HIVE_SERVER" title="Appending heap dump options for Tez config 'tez.am.launch.cmd-opts">
+ <task xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options_for_tez_am"/>
</execute-stage>
<execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Appending heap dump options for HiveSever2 Interactive">
http://git-wip-us.apache.org/repos/asf/ambari/blob/7cde24ed/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 0a02734..723a34c 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
@@ -776,7 +776,8 @@
<component name="HIVE_SERVER">
<pre-upgrade>
- <task xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options"/>
+ <task xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options_for_tez_task"/>
+ <task xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options_for_tez_am"/>
<task xsi:type="configure" id="hdp_2_6_0_0_hive_append_heap_dump_options"/>
<task xsi:type="configure" id="hive_log4j_parameterize" />
<task xsi:type="configure" id="hive_llap_log4j_parameterize" />
http://git-wip-us.apache.org/repos/asf/ambari/blob/7cde24ed/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
index d8413b6..3dd1bdd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
@@ -270,8 +270,10 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
# Append 'jvmGCParams' and 'Heap Dump related option' (({{heap_dump_opts}}) Expanded while writing the
# configurations at start/restart time).
tez_jvm_updated_opts = tez_jvm_opts + jvmGCParams + "{{heap_dump_opts}}"
+ putTezProperty('tez.am.launch.cmd-opts', tez_jvm_updated_opts)
putTezProperty('tez.task.launch.cmd-opts', tez_jvm_updated_opts)
- Logger.info("Updated 'tez-site' config 'tez.task.launch.cmd-opts' as : {0}".format(tez_jvm_updated_opts))
+ Logger.info("Updated 'tez-site' config 'tez.task.launch.cmd-opts' and 'tez.am.launch.cmd-opts' as "
+ ": {0}".format(tez_jvm_updated_opts))
def recommendRangerConfigurations(self, configurations, clusterData, services, hosts):
super(HDP26StackAdvisor, self).recommendRangerConfigurations(configurations, clusterData, services, hosts)