AMBARI-14730. After upgrade from 2.3.2 to 2.3.4, HBase fails to start, remove props for local indexing (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/109311d5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/109311d5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/109311d5 Branch: refs/heads/branch-dev-patch-upgrade Commit: 109311d5280cd453d1487434fdabaa274f865197 Parents: 6225849 Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Tue Jan 19 14:01:10 2016 -0800 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Wed Jan 20 13:35:43 2016 -0800 ---------------------------------------------------------------------- .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 6 +++++ .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 6 +++++ .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 3 +++ .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 3 +++ .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 17 +++++++++++++++ .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 6 +++++ .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 9 ++++++++ .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 5 +++++ .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 5 +++++ .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 23 ++++++++++++++++++++ 10 files changed, 83 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml index df12920..55fc336 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml @@ -406,6 +406,12 @@ <task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_delete_old_ranger_properties"/> </execute-stage> + <!-- HBASE --> + <!-- These HBASE configs changed in HDP 2.3.4.0, but Ambari can't distinguish HDP 2.3.2.0 vs HDP 2.3.4.0, so easier to always do them. --> + <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for HBASE Master"> + <task xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"/> + </execute-stage> + <!--TEZ--> <execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez"> <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_properties"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml index c5d74e2..b756deb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml @@ -440,6 +440,12 @@ <task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_delete_old_ranger_properties"/> </execute-stage> + <!-- HBASE --> + <!-- These HBASE configs changed in HDP 2.3.4.0, but Ambari can't distinguish HDP 2.3.2.0 vs HDP 2.3.4.0, so easier to always do them. --> + <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for HBASE Master"> + <task xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"/> + </execute-stage> + <!--TEZ--> <execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez"> <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_properties"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml index 7e7138d..4415909 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml @@ -602,6 +602,9 @@ <task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_copy_ranger_policies"/> <task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_delete_old_ranger_properties"/> + + <!-- These HBASE configs changed in HDP 2.3.4.0, but Ambari can't distinguish HDP 2.3.2.0 vs HDP 2.3.4.0, so easier to always do them. --> + <task xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"/> </pre-upgrade> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml index 6b5bcb1..d279ec1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml @@ -609,6 +609,9 @@ <task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_copy_ranger_policies"/> <task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_delete_old_ranger_properties"/> + + <!-- These HBASE configs changed in HDP 2.3.4.0, but Ambari can't distinguish HDP 2.3.2.0 vs HDP 2.3.4.0, so easier to always do them. --> + <task xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"/> </pre-upgrade> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/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 bdb4808..9e53c12 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 @@ -505,6 +505,23 @@ <transfer operation="delete" delete-key="XAAUDIT.DB.DATABASE_NAME"/> <transfer operation="delete" delete-key="XAAUDIT.DB.HOSTNAME"/> </definition> + + <!-- These HBASE configs changed in HDP 2.3.4.0, so upgrades like HDP 2.2 to 2.3.4.0+ still need them. --> + <definition xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"> + <type>hbase-site</type> + <set key="phoenix.functions.allowUserDefinedFunctions" value="true"/> + <transfer operation="delete" delete-key="hbase.master.loadbalancer.class" + if-key="hbase.master.loadbalancer.class" + if-type="hbase-site" + if-value="org.apache.phoenix.hbase.index.balancer.IndexLoadBalancer"/> + <replace key="hbase.coprocessor.master.classes" + find="org.apache.phoenix.hbase.index.master.IndexMasterObserver" + replace-with="" /> + <replace key="hbase.coprocessor.regionserver.classes" + find="org.apache.hadoop.hbase.regionserver.LocalIndexMerger" + replace-with="" /> + + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml index 57b2f42..208aa52 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml @@ -267,6 +267,12 @@ <direction>UPGRADE</direction> <!-- prevent config changes on downgrade --> <skippable>true</skippable> <!-- May fix configuration problems manually --> + <!-- HBASE --> + <!-- These HBASE configs changed in HDP 2.3.4.0, but Ambari can't distinguish HDP 2.3.2.0 vs HDP 2.3.4.0, so easier to always do them. --> + <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for HBASE Master"> + <task xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"/> + </execute-stage> + <execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez"> <task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_tez_lib_uris_property"/> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/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 45bf744..a93851b 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 @@ -268,10 +268,18 @@ <skippable>true</skippable> <!-- May fix configuration problems manually --> <supports-auto-skip-failure>false</supports-auto-skip-failure> + <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark"> <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" /> </execute-stage> + <!-- HBASE --> + <!-- These HBASE configs changed in HDP 2.3.4.0, but Ambari can't distinguish HDP 2.3.2.0 vs HDP 2.3.4.0, so easier to always do them. --> + <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for HBASE Master"> + <task xsi:type="configure" id="hdp_2_4_0_0_hbase_remove_local_indexing"/> + </execute-stage> + + <!-- HIVE, TEZ, --> <execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez"> <task xsi:type="configure" id="hdp_2_4_0_0_tez_client_adjust_tez_lib_uris_property"/> </execute-stage> @@ -280,6 +288,7 @@ <task xsi:type="configure" id="hdp_2_4_0_0_webhcat_server_update_configuration_paths"/> </execute-stage> + <!-- OOZIE --> <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server"> <task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" /> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml index ab955e4..cc6b394 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml @@ -559,6 +559,11 @@ <service name="HBASE"> <component name="HBASE_MASTER"> + <pre-upgrade> + <!-- These HBASE configs changed in HDP 2.3.4.0, but Ambari can't distinguish HDP 2.3.2.0 vs HDP 2.3.4.0, so easier to always do them. --> + <task xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"/> + </pre-upgrade> + <upgrade> <task xsi:type="restart-task"/> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/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 682815f..aef9c79 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 @@ -517,6 +517,11 @@ <service name="HBASE"> <component name="HBASE_MASTER"> + <pre-upgrade> + <!-- These HBASE configs changed in HDP 2.3.4.0, but Ambari can't distinguish HDP 2.3.2.0 vs HDP 2.3.4.0, so easier to always do them. --> + <task xsi:type="configure" id="hdp_2_4_0_0_hbase_remove_local_indexing"/> + </pre-upgrade> + <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/109311d5/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 6b41c84..0f72e5d 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 @@ -20,6 +20,29 @@ <services> + <service name="HBASE"> + <component name="HBASE_MASTER"> + <changes> + <!-- These HBASE configs changed in HDP 2.3.4.0, so upgrades like HDP 2.2 to 2.4 still need them. --> + <definition xsi:type="configure" id="hdp_2_4_0_0_hbase_remove_local_indexing"> + <type>hbase-site</type> + <set key="phoenix.functions.allowUserDefinedFunctions" value="true"/> + <transfer operation="delete" delete-key="hbase.master.loadbalancer.class" + if-key="hbase.master.loadbalancer.class" + if-type="hbase-site" + if-value="org.apache.phoenix.hbase.index.balancer.IndexLoadBalancer"/> + <replace key="hbase.coprocessor.master.classes" + find="org.apache.phoenix.hbase.index.master.IndexMasterObserver" + replace-with="" /> + <replace key="hbase.coprocessor.regionserver.classes" + find="org.apache.hadoop.hbase.regionserver.LocalIndexMerger" + replace-with="" /> + + </definition> + </changes> + </component> + </service> + <service name="TEZ"> <component name="TEZ_CLIENT"> <changes>
