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:50:31 UTC

ambari git commit: AMBARI-20060. update the headroom for llap - hdp stack (Siddharth Seth via smohanty)

Repository: ambari
Updated Branches:
  refs/heads/trunk 7cde24ed7 -> bf85ccec1


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/bf85ccec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf85ccec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf85ccec

Branch: refs/heads/trunk
Commit: bf85ccec17802d26137e2f98e85bd3bfb13ce711
Parents: 7cde24e
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:50:16 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/bf85ccec/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/bf85ccec/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 24f3f78..241ca8f 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
@@ -386,6 +386,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&#xA;appender.DRFA.policies.fsize.type = SizeBasedTriggeringPolicy&#xA;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/bf85ccec/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 5614915..0ef69cb 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
@@ -602,6 +602,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/bf85ccec/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 />