You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2017/02/22 15:02:18 UTC
ambari git commit: AMBARI-20106. Additional config changes for HSI -
HDP stack (Siddharth Seth via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 4e8093fca -> 05481cf05
AMBARI-20106. Additional config changes for HSI - HDP stack (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/05481cf0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/05481cf0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/05481cf0
Branch: refs/heads/branch-2.5
Commit: 05481cf05597808cc60e0dc22e2684acc2dc11af
Parents: 4e8093f
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Wed Feb 22 07:01:22 2017 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Feb 22 07:01:22 2017 -0800
----------------------------------------------------------------------
.../2.5/services/HIVE/configuration/hive-interactive-env.xml | 2 +-
.../2.5/services/HIVE/configuration/hive-interactive-site.xml | 6 ------
.../2.6/services/HIVE/configuration/hive-interactive-env.xml | 2 +-
.../2.6/services/HIVE/configuration/hive-interactive-site.xml | 7 +++++++
.../2.6/services/HIVE/configuration/tez-interactive-site.xml | 6 +++---
5 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/05481cf0/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
index 8f47182..c99e4fa 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
@@ -201,7 +201,7 @@
</property>
<property>
<name>llap_java_opts</name>
- <value>-XX:+AlwaysPreTouch {% if java_version > 7 %}-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif %}</value>
+ <value>-XX:+AlwaysPreTouch {% if java_version > 7 %}-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=40 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif %}</value>
<description>Java opts for llap daemons</description>
<display-name>LLAP daemon java opts</display-name>
<on-ambari-upgrade add="true"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/05481cf0/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
index 93e2020..8008bef 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
@@ -389,12 +389,6 @@ limitations under the License.
<on-ambari-upgrade add="true"/>
</property>
<property>
- <name>hive.llap.daemon.allow.permanent.fns</name>
- <value>false</value>
- <description>Whether LLAP daemon should localize the resources for permanent UDFs.</description>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
<name>hive.llap.io.memory.size</name>
<display-name>In-Memory Cache per Daemon</display-name>
<description>The amount of memory reserved for Hive's optimized in-memory cache.</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/05481cf0/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
index b659205..b54f622 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-env.xml
@@ -44,7 +44,7 @@
</property>
<property>
<name>llap_java_opts</name>
- <value>-XX:+AlwaysPreTouch {% if java_version > 7 %}-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif %}{{heap_dump_opts}}</value>
+ <value>-XX:+AlwaysPreTouch {% if java_version > 7 %}-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:InitiatingHeapOccupancyPercent=40 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif %}{{heap_dump_opts}}</value>
<description>Java opts for llap application</description>
<display-name>LLAP app java opts</display-name>
<on-ambari-upgrade add="false"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/05481cf0/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
index ceea350..0610833 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
@@ -96,4 +96,11 @@ limitations under the License.
<on-ambari-upgrade add="true"/>
</property>
+ <property>
+ <name>hive.llap.daemon.am.liveness.heartbeat.interval.ms</name>
+ <value>10000ms</value>
+ <description>Tez AM-LLAP heartbeat interval. This should be below the task timeout</description>
+ <on-ambari-upgrade add="false"/>
+ </property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/05481cf0/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
index f7de121..3ce5fed 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml
@@ -29,7 +29,7 @@
-->
<property>
<name>tez.task.heartbeat.timeout.check-ms</name>
- <value>11000</value>
+ <value>15000</value>
<description>The time interval, in milliseconds, at which the AM will check
for timed out tasks
</description>
@@ -37,7 +37,7 @@
</property>
<property>
<name>tez.task.timeout-ms</name>
- <value>20000</value>
+ <value>90000</value>
<description>Amount of time the Tez AM waits before marking a task which
has not sent in a heartbeat, as timed out
</description>
@@ -45,7 +45,7 @@
</property>
<property>
<name>tez.am.client.heartbeat.timeout.secs</name>
- <value>60</value>
+ <value>90</value>
<description>The time interval, after which an AM will kill itself, if it
does not receive a heartbeat from the client.
</description>