AMBARI-20597 - Pig exectype default value seems to be not changing after upgrade (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/54a823f5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54a823f5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54a823f5 Branch: refs/heads/branch-dev-logsearch Commit: 54a823f502a2ecf144ccaeee5725a8288104c944 Parents: 1e9cebb Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Mon Mar 27 16:26:54 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Mon Mar 27 19:01:24 2017 -0400 ---------------------------------------------------------------------- .../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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/54a823f5/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 5f135e9..b1bbb32 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> http://git-wip-us.apache.org/repos/asf/ambari/blob/54a823f5/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 3c309ce..48a2d96 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" http://git-wip-us.apache.org/repos/asf/ambari/blob/54a823f5/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 f908654..090e66f 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="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">" replace-with="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">\n<param name="MaxFileSize" value="{{atlas_log_max_backup_size}}MB" />"/> <replace key="content" find="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">" replace-with="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">\n<param name="MaxFileSize" value="{{atlas_log_number_of_backup_files}}" />"/> </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>
