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/19 07:55:54 UTC
[1/2] ambari git commit: AMBARI-20060. update the headroom for llap -
hdp stack (Siddharth Seth via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 bb90542fc -> bd5950a68
AMBARI-20060. update the headroom for llap - 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/adab9e1a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/adab9e1a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/adab9e1a
Branch: refs/heads/branch-2.5
Commit: adab9e1ac87f5faa24a0bc80cbaba495b65bbcab
Parents: bb90542
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sat Feb 18 23:50:16 2017 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sat Feb 18 23:51:11 2017 -0800
----------------------------------------------------------------------
.../2.5/services/HIVE/configuration/hive-interactive-env.xml | 2 +-
.../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 6 ++++++
.../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++
.../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
4 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/adab9e1a/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 ef9be76..8f47182 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
@@ -162,7 +162,7 @@
</property>
<property>
<name>llap_headroom_space</name>
- <value>6144</value>
+ <value>12288</value>
<description>
Maximum headroom reserved from the YARN container running LLAP daemons.
This is an upper limit used during automatic size calculations, and the actual
http://git-wip-us.apache.org/repos/asf/ambari/blob/adab9e1a/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 79a6a45..31bb296 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
@@ -379,6 +379,12 @@
<regex-replace key="content" find="appender.DRFA.strategy.max = ([0-9]+)" replace-with="appender.DRFA.strategy.max = {{llap_cli_log_maxbackupindex}}"/>
<replace key="content" find="appender.DRFA.strategy.type = DefaultRolloverStrategy" replace-with="appender.DRFA.strategy.type = DefaultRolloverStrategy
appender.DRFA.policies.fsize.type = SizeBasedTriggeringPolicy
appender.DRFA.policies.fsize.size = {{llap_cli_log_maxfilesize}}MB"/>
</definition>
+
+ <definition xsi:type="configure" id="llap_update_headroom" summary="Update headroom for LLAP">
+ <type>hive-interactive-env</type>
+ <set key="llap_headroom_space" value="12288"/>
+ </definition>
+
</changes>
</component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/adab9e1a/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 d1e9a0e..09c2b06 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
@@ -598,6 +598,12 @@
<function>wait_for_safemode_off</function>
</task>
</execute-stage>
+
+ <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update headroom for LLAP">
+ <task xsi:type="configure" id="llap_update_headroom">
+ <summary>Updating the Hive Log4J2 properties to include parameterizations</summary>
+ </task>
+ </execute-stage>
</group>
<group xsi:type="restart" name="KAFKA" title="Kafka">
http://git-wip-us.apache.org/repos/asf/ambari/blob/adab9e1a/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 723a34c..6309bcb 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
@@ -797,6 +797,7 @@
<task xsi:type="configure" id="webhcat_log4j_parameterize" />
<task xsi:type="configure" id="hive_log4j2_parameterize"/>
<task xsi:type="configure" id="llap_cli_log4j2_parameterize"/>
+ <task xsi:type="configure" id="llap_update_headroom"/>
</pre-upgrade>
<pre-downgrade />
[2/2] ambari git commit: AMBARI-20075. Fix druid router hosts in
config (Nishant Bangarwa via smohanty)
Posted by sm...@apache.org.
AMBARI-20075. Fix druid router hosts in config (Nishant Bangarwa via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd5950a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd5950a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd5950a6
Branch: refs/heads/branch-2.5
Commit: bd5950a684f091a37567119401cb49d023d1c27f
Parents: adab9e1
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sat Feb 18 23:55:18 2017 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sat Feb 18 23:55:18 2017 -0800
----------------------------------------------------------------------
.../common-services/DRUID/0.9.2/package/scripts/params.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd5950a6/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index 61f35b2..c615fac 100644
--- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -221,7 +221,7 @@ druid_coordinator_hosts = default("/clusterHostInfo/druid_coordinator_hosts", []
druid_coordinator_host = ""
if not len(druid_coordinator_hosts) == 0:
druid_coordinator_host = druid_coordinator_hosts[0]
-druid_router_hosts = default("/clusterHostInfo/druid_coordinator_hosts", [])
+druid_router_hosts = default("/clusterHostInfo/druid_router_hosts", [])
druid_router_host = ""
if not len(druid_router_hosts) == 0:
druid_router_host = druid_router_hosts[0]