ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject [35/51] [abbrv] ambari git commit: AMBARI-19789. Hive LLAP and Hive2 log4j changes should be removed from upgrade packs hdp 2.3 and hdp 2.4 (Madhuvanthi Radhakrishnan via smohanty)
Date Fri, 17 Feb 2017 22:57:13 GMT
AMBARI-19789. Hive LLAP and Hive2 log4j changes should be removed from upgrade packs hdp 2.3
and hdp 2.4 (Madhuvanthi Radhakrishnan via smohanty)

(cherry picked from commit 695d3a5b76994b2088bdb2adb8f337cb75b6cb54)

Change-Id: I4cb05abd45d47ac39a6d395197fb30c6b91addb5


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

Branch: refs/heads/branch-feature-BUG-74026
Commit: a08d0bfd729863e00c9ebb6ac2fad5ebb520d88c
Parents: d56e520
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Wed Feb 1 13:56:13 2017 -0800
Committer: Zuul <releng@hortonworks.com>
Committed: Tue Feb 7 06:44:14 2017 -0800

----------------------------------------------------------------------
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  | 27 ------------------
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 18 +-----------
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 18 ------------
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 17 -----------
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml     | 14 +--------
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     | 14 +--------
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     | 14 +--------
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  | 30 +-------------------
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 20 +------------
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 18 +-----------
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml     | 14 +--------
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     | 13 +--------
 12 files changed, 9 insertions(+), 208 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 73d40fb..f3e8ddd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -195,33 +195,6 @@
             <regex-replace key="content" find="#log4j.appender.DRFA.MaxBackupIndex=([0-9]+)"
replace-with="#log4j.appender.DRFA.MaxBackupIndex={{hive_log_maxbackupindex}}"/>
             <replace key="content" find="log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender"
replace-with="log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.DRFA.MaxFileSize
= {{hive_log_maxfilesize}}MB"/>
           </definition>
-          <definition xsi:type="configure" id="hive_llap_log4j_parameterize" summary="Parameterizing
Hive llap Log4J Properties">
-            <type>llap-daemon-log4j</type>
-            <set key="hive_llap_log_maxfilesize" value="256"/>
-            <set key = "hive_llap_log_maxbackupindex" value="240"/>
-            <regex-replace key="content" find="property.llap.daemon.log.maxfilesize =
([0-9]+)MB" replace-with="property.llap.daemon.log.maxfilesize = {{hive_llap_log_maxfilesize}}MB"/>
-            <regex-replace key="content" find="property.llap.daemon.log.maxbackupindex
= ([0-9]+)" replace-with="property.llap.daemon.log.maxbackupindex = {{hive_llap_log_maxbackupindex}}"/>
-          </definition>
-        </changes>
-      </component>
-
-      <component name="HIVE_SERVER_INTERACTIVE">
-        <changes>
-          <definition xsi:type="configure" id="hive_log4j2_parameterize" summary="Parameterizing
Hive Log4J2 Properties">
-            <type>hive-log4j2</type>
-            <set key="hive2_log_maxfilesize" value="256"/>
-            <set key = "hive2_log_maxbackupindex" value="30"/>
-            <regex-replace key="content" find="appender.DRFA.strategy.max = ([0-9]+)"
replace-with="appender.DRFA.strategy.max = {{hive2_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 = {{hive2_log_maxfilesize}}MB"/>
-          </definition>
-
-          <definition xsi:type="configure" id="llap_cli_log4j2_parameterize" summary="Parameterizing
LLAP Cli Log4J2 Properties">
-            <type>llap-cli-log4j2</type>
-            <set key="llap_cli_log_maxfilesize" value="256"/>
-            <set key = "llap_cli_log_maxbackupindex" value="30"/>
-            <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>
         </changes>
       </component>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
index 9e13036..52421d9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
@@ -323,11 +323,7 @@
           <summary>Updating the Hive Log4J properties to include parameterizations</summary>
         </task>
       </execute-stage>
-      <execute-stage service="HIVE" component="HIVE_SERVER" title="Parameterizing Hive
LLAP Log4J Properties">
-        <task xsi:type="configure" id="hive_llap_log4j_parameterize">
-          <summary>Updating the Hive llap Log4J properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
+
       <execute-stage service="HIVE" component="WEBHCAT_SERVER" title="Parameterizing WebHCat
Log4J Properties">
         <task xsi:type="configure" id="webhcat_log4j_parameterize">
           <summary>Updating the Webhcat Log4J properties to include parameterizations</summary>
@@ -338,18 +334,6 @@
         <task xsi:type="configure" id="hdp_2_4_0_0_hive_server_configure_authentication"/>
       </execute-stage>
 
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
LLAP Cli Log4J2 Properties">
-        <task xsi:type="configure" id="llap_cli_log4j2_parameterize">
-          <summary>Updating the LLAP Cli Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
Hive Log4J2 Properties">
-        <task xsi:type="configure" id="hive_log4j2_parameterize">
-          <summary>Updating the Hive Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
       <!--OOZIE-->
       <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes
for Oozie Server">
         <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
index 875b74e..ec61c63 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
@@ -368,24 +368,6 @@
         </task>
       </execute-stage>
 
-      <execute-stage service="HIVE" component="HIVE_SERVER" title="Parameterizing Hive
LLAP Log4J Properties">
-        <task xsi:type="configure" id="hive_llap_log4j_parameterize">
-          <summary>Updating the Hive llap Log4J properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
LLAP Cli Log4J2 Properties">
-        <task xsi:type="configure" id="llap_cli_log4j2_parameterize">
-          <summary>Updating the LLAP Cli Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
Hive Log4J2 Properties">
-        <task xsi:type="configure" id="hive_log4j2_parameterize">
-          <summary>Updating the Hive Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
       <execute-stage service="HIVE" component="WEBHCAT_SERVER" title="Parameterizing WebHCat
Log4J Properties">
         <task xsi:type="configure" id="webhcat_log4j_parameterize">
           <summary>Updating the Webhcat Log4J properties to include parameterizations</summary>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index 0afa2c9..dc53c67 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -399,23 +399,6 @@
           <summary>Updating the Hive Log4J properties to include parameterizations</summary>
         </task>
       </execute-stage>
-      <execute-stage service="HIVE" component="HIVE_SERVER" title="Parameterizing Hive
LLAP Log4J Properties">
-        <task xsi:type="configure" id="hive_llap_log4j_parameterize">
-          <summary>Updating the Hive llap Log4J properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
LLAP Cli Log4J2 Properties">
-        <task xsi:type="configure" id="llap_cli_log4j2_parameterize">
-          <summary>Updating the LLAP Cli Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
Hive Log4J2 Properties">
-        <task xsi:type="configure" id="hive_log4j2_parameterize">
-          <summary>Updating the Hive Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
 
       <!--OOZIE-->
       <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes
for Oozie Server">

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
index 34027ae..01e145e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
@@ -753,8 +753,7 @@
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_4_0_0_hive_server_configure_authentication"/>
           <task xsi:type="configure" id="hive_log4j_parameterize" />
-          <task xsi:type="configure" id="hive_llap_log4j_parameterize" />
-        </pre-upgrade>
+         </pre-upgrade>
 
         <pre-downgrade/>
 
@@ -787,17 +786,6 @@
           <task xsi:type="restart-task" />
         </upgrade>
       </component>
-
-      <component name="HIVE_SERVER_INTERACTIVE">
-        <pre-upgrade>
-          <task xsi:type="configure" id="hive_log4j2_parameterize"/>
-          <task xsi:type="configure" id="llap_cli_log4j2_parameterize"/>
-        </pre-upgrade>
-        <pre-downgrade/>
-        <upgrade>
-	   <task xsi:type="restart-task" />
-        </upgrade>
-      </component>
     </service>
 
     <service name="SLIDER">

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
index 220c358..604c1dc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
@@ -875,7 +875,6 @@
           <task xsi:type="configure" id="hdp_2_4_0_0_hive_server_configure_authentication"/>
           <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db" />
           <task xsi:type="configure" id="hive_log4j_parameterize" />
-          <task xsi:type="configure" id="hive_llap_log4j_parameterize" />
 
           <!-- Remove Atlas configs that were incorrectly added to hive-site instead of
Atlas' application.properties. -->
           <task xsi:type="configure" id="hdp_2_5_0_0_remove_hive_atlas_configs" />
@@ -916,18 +915,7 @@
           <task xsi:type="restart-task" />
         </upgrade>
       </component>
-
-      <component name="HIVE_SERVER_INTERACTIVE">
-        <pre-upgrade>
-          <task xsi:type="configure" id="hive_log4j2_parameterize"/>
-          <task xsi:type="configure" id="llap_cli_log4j2_parameterize"/>
-        </pre-upgrade>
-        <pre-downgrade/>
-        <upgrade>
-	  <task xsi:type="restart-task" />
-        </upgrade>
-      </component>
-    </service>
+   </service>
 
     <service name="SLIDER">
       <component name="SLIDER">

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index 24bf816..290d3c5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -888,7 +888,6 @@
             <summary>Update hive-env content</summary>
           </task>
           <task xsi:type="configure" id="hive_log4j_parameterize" />
-          <task xsi:type="configure" id="hive_llap_log4j_parameterize" />
         </pre-upgrade>
 
         <pre-downgrade/>
@@ -922,18 +921,7 @@
           <task xsi:type="restart-task" />
         </upgrade>
       </component>
-
-      <component name="HIVE_SERVER_INTERACTIVE">
-        <pre-upgrade>
-          <task xsi:type="configure" id="hive_log4j2_parameterize"/>
-          <task xsi:type="configure" id="llap_cli_log4j2_parameterize"/>
-        </pre-upgrade>
-        <pre-downgrade/>
-        <upgrade>
-	<task xsi:type="restart-task" />
-        </upgrade>
-      </component>
-    </service>
+   </service>
 
     <service name="SLIDER">
       <component name="SLIDER">

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
index 8d80491..6a462ec 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
@@ -96,35 +96,7 @@
             <regex-replace key="content" find="#log4j.appender.DRFA.MaxBackupIndex=([0-9]+)"
replace-with="#log4j.appender.DRFA.MaxBackupIndex={{hive_log_maxbackupindex}}"/>
             <replace key="content" find="log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender"
replace-with="log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender&#xA;log4j.appender.DRFA.MaxFileSize
= {{hive_log_maxfilesize}}MB"/>
           </definition>
-          <definition xsi:type="configure" id="hive_llap_log4j_parameterize" summary="Parameterizing
Hive llap Log4J Properties">
-            <type>llap-daemon-log4j</type>
-            <set key="hive_llap_log_maxfilesize" value="256"/>
-            <set key = "hive_llap_log_maxbackupindex" value="240"/>
-            <regex-replace key="content" find="property.llap.daemon.log.maxfilesize =
([0-9]+)MB" replace-with="property.llap.daemon.log.maxfilesize = {{hive_llap_log_maxfilesize}}MB"/>
-            <regex-replace key="content" find="property.llap.daemon.log.maxbackupindex
= ([0-9]+)" replace-with="property.llap.daemon.log.maxbackupindex = {{hive_llap_log_maxbackupindex}}"/>
-          </definition>
-        </changes>
-      </component>
-
-      <component name="HIVE_SERVER_INTERACTIVE">
-        <changes>
-          <definition xsi:type="configure" id="hive_log4j2_parameterize" summary="Parameterizing
Hive Log4J2 Properties">
-            <type>hive-log4j2</type>
-            <set key="hive2_log_maxfilesize" value="256"/>
-            <set key = "hive2_log_maxbackupindex" value="30"/>
-            <regex-replace key="content" find="appender.DRFA.strategy.max = ([0-9]+)"
replace-with="appender.DRFA.strategy.max = {{hive2_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 = {{hive2_log_maxfilesize}}MB"/>
-          </definition>
-
-          <definition xsi:type="configure" id="llap_cli_log4j2_parameterize" summary="Parameterizing
LLAP Cli Log4J2 Properties">
-            <type>llap-cli-log4j2</type>
-            <set key="llap_cli_log_maxfilesize" value="256"/>
-            <set key = "llap_cli_log_maxbackupindex" value="30"/>
-            <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>
-
-        </changes>
+         </changes>
       </component>
 
       <component name="WEBHCAT_SERVER">

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
index 96dc65b..6bc7859 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
@@ -429,31 +429,13 @@
         </task>
       </execute-stage>
 
-      <execute-stage service="HIVE" component="HIVE_SERVER" title="Parameterizing Hive
LLAP Log4J Properties">
-        <task xsi:type="configure" id="hive_llap_log4j_parameterize">
-          <summary>Updating the Hive llap Log4J properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
       <execute-stage service="HIVE" component="WEBHCAT_SERVER" title="Parameterizing WebHCat
Log4J Properties">
         <task xsi:type="configure" id="webhcat_log4j_parameterize">
           <summary>Updating the Webhcat Log4J properties to include parameterizations</summary>
         </task>
       </execute-stage>
 
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
LLAP Cli Log4J2 Properties">
-        <task xsi:type="configure" id="llap_cli_log4j2_parameterize">
-          <summary>Updating the LLAP Cli Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
Hive Log4J2 Properties">
-        <task xsi:type="configure" id="hive_log4j2_parameterize">
-          <summary>Updating the Hive Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
-      <!-- HBASE -->
+     <!-- HBASE -->
       <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes
for Hbase Master">
         <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db"/>
       </execute-stage>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
index 65efb1a..8a988cc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
@@ -438,29 +438,13 @@
           <summary>Updating the Hive Log4J properties to include parameterizations</summary>
         </task>
       </execute-stage>
-      <execute-stage service="HIVE" component="HIVE_SERVER" title="Parameterizing Hive
LLAP Log4J Properties">
-        <task xsi:type="configure" id="hive_llap_log4j_parameterize">
-          <summary>Updating the Hive llap Log4J properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
+
       <execute-stage service="HIVE" component="WEBHCAT_SERVER" title="Parameterizing WebHCat
Log4J Properties">
         <task xsi:type="configure" id="webhcat_log4j_parameterize">
           <summary>Updating the Webhcat Log4J properties to include parameterizations</summary>
         </task>
       </execute-stage>
 
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
LLAP Cli Log4J2 Properties">
-        <task xsi:type="configure" id="llap_cli_log4j2_parameterize">
-          <summary>Updating the LLAP Cli Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
-      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Parameterizing
Hive Log4J2 Properties">
-        <task xsi:type="configure" id="hive_log4j2_parameterize">
-          <summary>Updating the Hive Log4J2 properties to include parameterizations</summary>
-        </task>
-      </execute-stage>
-
       <!-- HBASE -->
       <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes
for Hbase Master">
         <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
index f172209..3774896 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
@@ -876,7 +876,6 @@
             <summary>Update hive-env content</summary>
           </task>
           <task xsi:type="configure" id="hive_log4j_parameterize" />
-          <task xsi:type="configure" id="hive_llap_log4j_parameterize" />
         </pre-upgrade>
 
         <pre-downgrade/>
@@ -907,18 +906,7 @@
           <task xsi:type="restart-task" />
         </upgrade>
       </component>
-
-      <component name="HIVE_SERVER_INTERACTIVE">
-        <pre-upgrade>
-          <task xsi:type="configure" id="hive_log4j2_parameterize"/>
-          <task xsi:type="configure" id="llap_cli_log4j2_parameterize"/>
-        </pre-upgrade>
-        <pre-downgrade/>
-        <upgrade>
-	<task xsi:type="restart-task" />
-        </upgrade>
-      </component>
-    </service>
+     </service>
 
     <service name="SLIDER">
       <component name="SLIDER">

http://git-wip-us.apache.org/repos/asf/ambari/blob/a08d0bfd/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
index ecdbf30..cadef73 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
@@ -886,7 +886,6 @@
             <summary>Update hive-env content</summary>
           </task>
           <task xsi:type="configure" id="hive_log4j_parameterize" />
-          <task xsi:type="configure" id="hive_llap_log4j_parameterize" />
 
         </pre-upgrade>
 
@@ -919,17 +918,7 @@
         </upgrade>
       </component>
 
-      <component name="HIVE_SERVER_INTERACTIVE">
-        <pre-upgrade>
-          <task xsi:type="configure" id="hive_log4j2_parameterize"/>
-          <task xsi:type="configure" id="llap_cli_log4j2_parameterize"/>
-        </pre-upgrade>
-        <pre-downgrade/>
-        <upgrade>
-	<task xsi:type="restart-task" />
-        </upgrade>
-      </component>
-    </service>
+   </service>
 
     <service name="SLIDER">
       <component name="SLIDER">


Mime
View raw message