From 54a823f502a2ecf144ccaeee5725a8288104c944 Mon Sep 17 00:00:00 2001
From: Jonathan Hurley <jhurley@hortonworks.com>
Date: Mon, 27 Mar 2017 16:26:54 -0400
Subject: [PATCH] AMBARI-20597 - Pig exectype default value seems to be not
 changing after upgrade (jonathanhurley)

---
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml     | 10 +++++-----
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml     | 14 +++++++-------
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml     |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

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 5f135e97076..b1bbb321c9d 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
@@ -117,10 +117,10 @@
           Will only be written to the local file system if Atlas is present. -->
           <definition xsi:type="configure" id="hdp_2_5_0_0_add_sqoop_atlas_security_configs">
             <type>sqoop-atlas-application.properties</type>
-            <set key="atlas.jaas.KafkaClient.option.useTicketCache" value="true" 
+            <set key="atlas.jaas.KafkaClient.option.useTicketCache" value="true"
               if-type="cluster-env" if-key="security_enabled" if-value="true"/>
 
-            <set key="atlas.jaas.KafkaClient.option.renewTicket" value="true" 
+            <set key="atlas.jaas.KafkaClient.option.renewTicket" value="true"
               if-type="cluster-env" if-key="security_enabled" if-value="true"/>
           </definition>
         </changes>
@@ -132,7 +132,7 @@
         <changes>
           <definition xsi:type="configure" id="hdp_2_6_0_0_pig_use_tez">
             <type>pig-properties</type>
-            <replace key="exectype" find="exectype=mapreduce" replace-with="exectype=tez" />
+            <regex-replace key="content" find=" *#* *exectype=(\w+)" replace-with="exectype=tez" />
           </definition>
         </changes>
       </component>
@@ -278,8 +278,8 @@
           </definition>
 
           <definition xsi:type="configure" id="hdp_2_5_0_0_set_external_solrCloud_flag">
-            <type>ranger-env</type>            
-            <set key="is_external_solrCloud_enabled" value="true" 
+            <type>ranger-env</type>
+            <set key="is_external_solrCloud_enabled" value="true"
               if-type="ranger-env" if-key="is_solrCloud_enabled" if-value="true"/>
           </definition>
 
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 3c309ce56a4..48a2d960eee 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
@@ -52,11 +52,11 @@
           Will only be written to the local file system if Atlas is present. -->
           <definition xsi:type="configure" id="hdp_2_5_0_0_add_sqoop_atlas_security_configs">
             <type>sqoop-atlas-application.properties</type>
-            <set key="atlas.jaas.KafkaClient.option.useTicketCache" value="true" 
+            <set key="atlas.jaas.KafkaClient.option.useTicketCache" value="true"
               if-type="cluster-env" if-key="security_enabled" if-value="true"/>
 
-            <set key="atlas.jaas.KafkaClient.option.renewTicket" value="true" 
-              if-type="cluster-env" if-key="security_enabled" if-value="true"/>          
+            <set key="atlas.jaas.KafkaClient.option.renewTicket" value="true"
+              if-type="cluster-env" if-key="security_enabled" if-value="true"/>
           </definition>
         </changes>
       </component>
@@ -67,7 +67,7 @@
         <changes>
           <definition xsi:type="configure" id="hdp_2_6_0_0_pig_use_tez">
             <type>pig-properties</type>
-            <replace key="exectype" find="exectype=mapreduce" replace-with="exectype=tez" />
+            <regex-replace key="content" find=" *#* *exectype=(\w+)" replace-with="exectype=tez" />
           </definition>
         </changes>
       </component>
@@ -168,8 +168,8 @@
           </definition>
 
           <definition xsi:type="configure" id="hdp_2_5_0_0_set_external_solrCloud_flag">
-            <type>ranger-env</type>            
-            <set key="is_external_solrCloud_enabled" value="true" 
+            <type>ranger-env</type>
+            <set key="is_external_solrCloud_enabled" value="true"
               if-type="ranger-env" if-key="is_solrCloud_enabled" if-value="true"/>
           </definition>
 
@@ -390,7 +390,7 @@
             <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir" />
           </definition>
 
-          
+
           <definition xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0">
             <type>storm-site</type>
             <replace key="_storm.thrift.nonsecure.transport" find="backtype.storm.security.auth.SimpleTransportPlugin"
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 f908654ff9e..090e66f8b43 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
@@ -144,7 +144,7 @@
             <replace key="content" find="&lt;appender name=&quot;FILE&quot; class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;" replace-with="&lt;appender name=&quot;FILE&quot; class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;\n&lt;param name=&quot;MaxFileSize&quot; value=&quot;{{atlas_log_max_backup_size}}MB&quot; /&gt;"/>
             <replace key="content" find="&lt;appender name=&quot;FILE&quot; class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;" replace-with="&lt;appender name=&quot;FILE&quot; class=&quot;org.apache.log4j.DailyRollingFileAppender&quot;&gt;\n&lt;param name=&quot;MaxFileSize&quot; value=&quot;{{atlas_log_number_of_backup_files}}&quot; /&gt;"/>
           </definition>
-          
+
           <definition xsi:type="configure" id="hdp_2_5_4_0_atlas_exclude_tls_protocol" summary="Excluding TLS v1.2 Protocol">
             <type>application-properties</type>
             <set key="atlas.ssl.exclude.protocols" value="TLSv1.2" if-type="application-properties" if-key="atlas.ssl.exclude.protocols" if-key-state="absent"/>
@@ -396,7 +396,7 @@
         <changes>
           <definition xsi:type="configure" id="hdp_2_6_0_0_pig_use_tez">
             <type>pig-properties</type>
-            <replace key="exectype" find="exectype=mapreduce" replace-with="exectype=tez" />
+            <regex-replace key="content" find=" *#* *exectype=(\w+)" replace-with="exectype=tez" />
           </definition>
         </changes>
       </component>