Return-Path: <commits-return-41821-archive-asf-public=cust-asf.ponee.io@ambari.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 4AB90200C68
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 19 Apr 2017 02:59:22 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 491D7160BAC; Wed, 19 Apr 2017 00:59:22 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 69026160BA1
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 19 Apr 2017 02:59:21 +0200 (CEST)
Received: (qmail 71528 invoked by uid 500); 19 Apr 2017 00:59:20 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 71519 invoked by uid 99); 19 Apr 2017 00:59:20 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Apr 2017 00:59:20 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 15296DFB92; Wed, 19 Apr 2017 00:59:20 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: swapan@apache.org
To: commits@ambari.apache.org
Message-Id: <45c6ffc70b21431d8a60002b2cea122f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-20782. Add config changes from AMBARI-20537
 to hive component upgrade path. (Swapan Shridhar via Prasanth Jayachandran).
Date: Wed, 19 Apr 2017 00:59:20 +0000 (UTC)
archived-at: Wed, 19 Apr 2017 00:59:22 -0000

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 71399b7f7 -> 8be765f1d


AMBARI-20782. Add config changes from AMBARI-20537 to hive component upgrade path. (Swapan Shridhar via Prasanth Jayachandran).


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8be765f1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8be765f1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8be765f1

Branch: refs/heads/branch-2.5
Commit: 8be765f1d08b8b28c5170a11a97ea7da4ec67671
Parents: 71399b7
Author: Swapan Shridhar <sshridhar@hortonworks.com>
Authored: Tue Apr 18 17:58:27 2017 -0700
Committer: Swapan Shridhar <sshridhar@hortonworks.com>
Committed: Tue Apr 18 17:58:35 2017 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 10 ++++++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 37 +++++++++++++-------
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |  2 ++
 3 files changed, 36 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8be765f1/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 1762d15..99107ef 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
@@ -481,6 +481,16 @@
             <transfer operation="delete" delete-key="atlas.cluster.name"/>
           </definition>
 
+          <definition xsi:type="configure" id="llap_append_stack_size_java_opts" summary="Update JVM stack size for LLAP">
+            <type>hive-interactive-env</type>
+            <insert key="llap_java_opts" value="-Xss512k" insert-type="append" newline-before="false" newline-after="false" />
+          </definition>
+
+          <definition xsi:type="configure" id="llap_update_shuffle_parallel_copies" summary="Update tez shuffle parallel copies for LLAP">
+            <type>hive-interactive-site</type>
+            <set key="tez.runtime.shuffle.parallel.copies" value="8"/>
+          </definition>
+
         </changes>
 
       </component>

http://git-wip-us.apache.org/repos/asf/ambari/blob/8be765f1/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 f1b26d6..e347a02 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
@@ -536,6 +536,30 @@
         <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="Update headroom for LLAP">
+        <task xsi:type="configure" id="llap_update_headroom">
+          <summary>Updating headroom for LLAP</summary>
+        </task>
+      </execute-stage>
+
+      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update Hash Aggregation settings for LLAP">
+        <task xsi:type="configure" id="llap_update_hashaggregation">
+          <summary>Updating Hash Aggregation settings for LLAP</summary>
+        </task>
+      </execute-stage>
+
+      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update JVM stack size for LLAP">
+        <task xsi:type="configure" id="llap_append_stack_size_java_opts">
+          <summary>Updating JVM stack size for LLAP</summary>
+        </task>
+      </execute-stage>
+
+      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update tez shuffle parallel copies for LLAP">
+        <task xsi:type="configure" id="llap_update_shuffle_parallel_copies">
+          <summary>Updating tez shuffle parallel copies for LLAP</summary>
+        </task>
+      </execute-stage>
+
       <execute-stage service="HIVE" component="HIVE_SERVER" title="Copying hive.tez.container.size to HIVE SERVER INTERACTIVE's hive-site">
         <task xsi:type="configure" id="hdp_2_6_0_0_copy_hive_tez_container_size_to_hiveInteractive"/>
       </execute-stage>
@@ -692,19 +716,6 @@
           <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>
-
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update Hash Aggregation settings for LLAP">
-        <task xsi:type="configure" id="llap_update_hashaggregation">
-          <summary>Updating Hash Aggregation settings for LLAP</summary>
-        </task>
-      </execute-stage>
-
     </group>
 
     <group xsi:type="restart" name="KAFKA" title="Kafka">

http://git-wip-us.apache.org/repos/asf/ambari/blob/8be765f1/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 53d4579..94aab48 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
@@ -842,6 +842,8 @@
           <task xsi:type="configure" id="llap_cli_log4j2_parameterize"/>
           <task xsi:type="configure" id="llap_update_headroom"/>
           <task xsi:type="configure" id="llap_update_hashaggregation"/>
+          <task xsi:type="configure" id="llap_append_stack_size_java_opts"/>
+          <task xsi:type="configure" id="llap_update_shuffle_parallel_copies"/>
         </pre-upgrade>
         
         <pre-downgrade />