You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/10/27 16:35:42 UTC
ambari git commit: AMBARI-13572: Allow snapshots/backups to be
skippable when doing RU (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 8c7b9f8fd -> c55233a83
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/c55233a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c55233a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c55233a8
Branch: refs/heads/trunk
Commit: c55233a83cf51fb880fc5c63a844deed68ce2589
Parents: 8c7b9f8
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Tue Oct 27 08:35:36 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Tue Oct 27 08:35:36 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/c55233a8/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 e787ca3..c283391 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
@@ -44,32 +44,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>take_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 {{hosts.all}}.</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/c55233a8/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 1a90991..c091bb7 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
@@ -45,37 +45,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>take_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 {{hosts.all}}.</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/c55233a8/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 5180afa..ea2c63f 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
@@ -45,48 +45,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>take_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 {{hosts.all}}.</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">