ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-13572: Allow snapshots/backups to be skippable when doing RU (jluniya)
Date Tue, 27 Oct 2015 15:40:16 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 a653be752 -> 568b7137b


AMBARI-13572: Allow snapshots/backups to be skippable when doing RU (jluniya)


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

Branch: refs/heads/branch-2.1.2
Commit: 568b7137bd6c3a11fcefbf6bb2e4309b3721f5b4
Parents: a653be7
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Tue Oct 27 08:35:36 2015 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Tue Oct 27 08:40:10 2015 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml     | 13 ++++---
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml     | 26 +++++++------
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml     | 40 +++++++++++---------
 3 files changed, 46 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/568b7137/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
index 3837e63..e453f84 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
@@ -31,32 +31,35 @@
           <function>prepare_rolling_upgrade</function>
         </task>
       </execute-stage>
+    </group>
 
-      <execute-stage service="HBASE" component="HBASE_MASTER" title="Pre Upgrade HBase">
+    <group xsi:type="cluster" name="PREPARE_BACKUPS" title="Prepare Backups">
+      <direction>UPGRADE</direction>
+      <skippable>true</skippable>
+      <execute-stage service="HBASE" component="HBASE_MASTER" title="Pre Upgrade HBase
Backup">
         <task xsi:type="execute" hosts="master">
           <script>scripts/hbase_upgrade.py</script>
           <function>snapshot</function>
         </task>
       </execute-stage>
 
-      <execute-stage service="HIVE" component="HIVE_METASTORE" title="Pre Upgrade Hive">
+      <execute-stage service="HIVE" component="HIVE_METASTORE" title="Pre Upgrade Hive
Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup the Hive Metastore database located
on the following host(s): {{hosts.all}}.</message>
         </task>
       </execute-stage>
 
-      <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Pre Upgrade Oozie">
+      <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Pre Upgrade Oozie
Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup the Oozie Server database on {{oozie-env/oozie_hostname}}.</message>
         </task>
       </execute-stage>
 
-      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger">
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger
Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup the Ranger Admin database and Ranger
Audit database</message>
         </task>
       </execute-stage>
-
     </group>
 
     <group name="ZOOKEEPER" title="ZooKeeper">

http://git-wip-us.apache.org/repos/asf/ambari/blob/568b7137/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 e6d845d..fce2efd 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
@@ -34,37 +34,41 @@
         </task>
       </execute-stage>
 
-      <execute-stage service="HBASE" component="HBASE_MASTER" title="Pre Upgrade HBase">
+      <execute-stage service="TEZ" component="TEZ_CLIENT" title="Check Tez Tarball">
+        <task xsi:type="execute" hosts="any">
+          <script>scripts/pre_upgrade.py</script>
+          <function>prepare</function>
+        </task>
+      </execute-stage>
+    </group>
+
+    <group xsi:type="cluster" name="PREPARE_BACKUPS" title="Prepare Backups">
+      <direction>UPGRADE</direction>
+      <skippable>true</skippable>
+      <execute-stage service="HBASE" component="HBASE_MASTER" title="Pre Upgrade HBase
Backup">
         <task xsi:type="execute" hosts="master">
           <script>scripts/hbase_upgrade.py</script>
           <function>snapshot</function>
         </task>
       </execute-stage>
 
-      <execute-stage service="HIVE" component="HIVE_METASTORE" title="Pre Upgrade Hive">
+      <execute-stage service="HIVE" component="HIVE_METASTORE" title="Pre Upgrade Hive
Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup the Hive Metastore database located
on the following host(s): {{hosts.all}}.</message>
         </task>
       </execute-stage>
 
-      <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Pre Upgrade Oozie">
+      <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Pre Upgrade Oozie
Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup the Oozie Server database on {{oozie-env/oozie_hostname}}.</message>
         </task>
       </execute-stage>
 
-      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger">
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger
Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup the Ranger Admin database and Ranger
Audit database</message>
         </task>
       </execute-stage>
-
-      <execute-stage service="TEZ" component="TEZ_CLIENT" title="Check Tez Tarball">
-        <task xsi:type="execute" hosts="any">
-          <script>scripts/pre_upgrade.py</script>
-          <function>prepare</function>
-        </task>
-      </execute-stage>
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/568b7137/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 acc65a6..b0cb1f1 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
@@ -32,48 +32,54 @@
         </task>
       </execute-stage>
 
-      <execute-stage service="HBASE" component="HBASE_MASTER" title="Pre Upgrade HBase">
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger
Admin">
+        <task xsi:type="execute" hosts="master">
+          <script>scripts/ranger_admin.py</script>
+          <function>pre_rolling_restart</function>
+        </task>
+      </execute-stage>
+
+      <execute-stage service="TEZ" component="TEZ_CLIENT" title="Check Tez Tarball">
+        <task xsi:type="execute" hosts="any">
+          <script>scripts/pre_upgrade.py</script>
+          <function>prepare</function>
+        </task>
+      </execute-stage>
+    </group>
+
+    <group xsi:type="cluster" name="PREPARE_BACKUPS" title="Prepare Backups">
+      <direction>UPGRADE</direction>
+      <skippable>true</skippable>
+      <execute-stage service="HBASE" component="HBASE_MASTER" title="Pre Upgrade HBase
Backup">
         <task xsi:type="execute" hosts="master">
           <script>scripts/hbase_upgrade.py</script>
           <function>snapshot</function>
         </task>
       </execute-stage>
 
-      <execute-stage service="HIVE" component="HIVE_METASTORE" title="Pre Upgrade Hive">
+      <execute-stage service="HIVE" component="HIVE_METASTORE" title="Pre Upgrade Hive
Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup the Hive Metastore database located
on the following host(s): {{hosts.all}}.</message>
         </task>
       </execute-stage>
 
-      <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Pre Upgrade Oozie">
+      <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Pre Upgrade Oozie
Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup the Oozie Server database on {{oozie-env/oozie_hostname}}.</message>
         </task>
       </execute-stage>
 
-      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger
Admin">
-        <task xsi:type="execute" hosts="master">
-            <script>scripts/ranger_admin.py</script>
-            <function>pre_rolling_restart</function>
-        </task>
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Pre Upgrade Ranger
Admin Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup the Ranger Admin database and Ranger
Audit database</message>
         </task>
       </execute-stage>
 
-      <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Pre Upgrade
Ranger KMS">
+      <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Pre Upgrade
Ranger KMS Backup">
         <task xsi:type="manual">
           <message>Before continuing, please backup Ranger KMS database</message>
         </task>
       </execute-stage>
-
-      <execute-stage service="TEZ" component="TEZ_CLIENT" title="Check Tez Tarball">
-        <task xsi:type="execute" hosts="any">
-          <script>scripts/pre_upgrade.py</script>
-          <function>prepare</function>
-        </task>
-      </execute-stage>
-
     </group>
 
     <group name="ZOOKEEPER" title="ZooKeeper">


Mime
View raw message