Repository: ambari Updated Branches: refs/heads/branch-2.5 507333968 -> 19eaf22e5
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/19eaf22e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/19eaf22e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/19eaf22e Branch: refs/heads/branch-2.5 Commit: 19eaf22e5222728ccdcce30ad6d02b803eec8fb4 Parents: 5073339 Author: Jonathan Hurley <[email protected]> Authored: Mon Mar 27 16:26:54 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Thu Mar 30 10:10:55 2017 -0400 ---------------------------------------------------------------------- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 10 +++++----- .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 12 ++++++------ .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/19eaf22e/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 eeb10fc..c5d11f8 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/19eaf22e/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 1b809c5..43241eb 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> http://git-wip-us.apache.org/repos/asf/ambari/blob/19eaf22e/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 febd8e2..9bc9825 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 @@ -379,7 +379,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>
