ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject ambari git commit: AMBARI-14655. RU: Oozie service check failed during upgrade (ncole)
Date Wed, 13 Jan 2016 23:04:40 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 6105ab5f5 -> 2503b606a


AMBARI-14655. RU: Oozie service check failed during upgrade (ncole)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2503b606
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2503b606
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2503b606

Branch: refs/heads/trunk
Commit: 2503b606a159741e3230095837a4e38ae8e28968
Parents: 6105ab5
Author: Nate Cole <ncole@hortonworks.com>
Authored: Wed Jan 13 17:23:26 2016 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Wed Jan 13 18:04:29 2016 -0500

----------------------------------------------------------------------
 .../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml   |  4 ++++
 .../resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml    |  1 +
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml   |  4 ++++
 .../resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml    |  2 ++
 .../resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 11 +++++++++++
 5 files changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2503b606/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 ff68982..012c629 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
@@ -484,6 +484,10 @@
         <task xsi:type="configure" id="hdp_2_3_0_0_oozie_remove_redundant_configurations"/>
       </execute-stage>
 
+      <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>
+
       <!--KNOX-->
       <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Apply config changes
for Knox Gateway">
         <task xsi:type="configure" id="hdp_2_3_0_0_knox_configure_ranger_policy"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2503b606/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 73eedb7..5aee69d 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
@@ -742,6 +742,7 @@
       <component name="OOZIE_SERVER">
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_3_0_0_oozie_remove_redundant_configurations"/>
+          <task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
 
           <task xsi:type="execute" hosts="all" summary="Shut down all Oozie servers">
             <script>scripts/oozie_server.py</script>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2503b606/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 b53fcf7..50c8584 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,10 @@
         <task xsi:type="configure" id="hdp_2_4_0_0_webhcat_server_update_configuration_paths"/>
       </execute-stage>
 
+      <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>
+
       <!-- KAFKA  -->
       <!--TODO: remove? Used for non-rolling upgrade only-->
       <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes
for Kafka">

http://git-wip-us.apache.org/repos/asf/ambari/blob/2503b606/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 00747b1..b570d61 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
@@ -636,6 +636,8 @@
     <service name="OOZIE">
       <component name="OOZIE_SERVER">
         <pre-upgrade>
+          <task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
+        
           <task xsi:type="execute" hosts="all" summary="Shut down all Oozie servers">
             <script>scripts/oozie_server.py</script>
             <function>stop</function>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2503b606/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 e8f1db4..d5e4f78 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
@@ -30,6 +30,17 @@
         </changes>
       </component>
     </service>
+    
+    <service name="OOZIE">
+      <component name="OOZIE_SERVER">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes"
summary="Updating Oozie Service classes">
+            <type>oozie-site</type>
+            <replace key="oozie.services" find="org.apache.oozie.service.CoordinatorStoreService,"
replace-with="" />
+          </definition>
+        </changes>
+      </component>
+    </service>
 
     <service name="HIVE">
       <component name="HIVE_SERVER">


Mime
View raw message