ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: AMBARI-14730. After upgrade from 2.3.2 to 2.3.4, HBase fails to start, remove props for local indexing (alejandro)
Date Wed, 20 Jan 2016 21:38:35 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 311382a8c -> 6790b39f1


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/6790b39f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6790b39f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6790b39f

Branch: refs/heads/branch-2.2
Commit: 6790b39f19bcc4b83cb9d42821df3e9b71500e57
Parents: 311382a
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Wed Jan 20 13:36:55 2016 -0800
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Wed Jan 20 13:36:55 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 |  1 +
 .../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, 75 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6790b39f/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 5014728..218646a 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/6790b39f/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 8feb7cb..c76492d 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/6790b39f/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 9ac2ca6..6d3c02e 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
@@ -607,6 +607,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/6790b39f/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 4345f43..532e9a6 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/6790b39f/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/6790b39f/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 4d2fb6b..6b13a14 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/6790b39f/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 d6d221b..5f942a1 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
@@ -280,6 +280,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/6790b39f/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 3d7b6ed..975de1d 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/6790b39f/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 930a026..999ed84 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/6790b39f/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>


Mime
View raw message