AMBARI-20365 Display Ranger DB backup instruction in sections on the manual step during RU (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/971eaff1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/971eaff1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/971eaff1 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 971eaff1d16949a38112eeb9d1869dec45affc44 Parents: 528ac5c Author: Di Li <d...@apache.org> Authored: Fri Mar 10 12:50:50 2017 -0500 Committer: Di Li <d...@apache.org> Committed: Fri Mar 10 12:50:50 2017 -0500 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 11 ++++++----- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 11 ++++++----- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 9 ++++----- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 9 ++++----- .../resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 10 +++++----- .../resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 9 ++++----- .../resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 9 ++++----- 7 files changed, 33 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/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 6bf2d4c..89b5126 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 @@ -96,11 +96,12 @@ <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. - If audit database size is too large( > 3GB ) then follow the below instructions: - 1. Backup the audit table from audit database. - 2. Truncate audit table. - 3. Follow upgrade process and once completed then restore audit data to audit table.</message> + <message> + Before continuing, please backup the Ranger Admin database and Ranger Audit database. If audit database size is too large( > 3GB ) then follow the below instructions: + </message> + <message>1. Backup the audit table from audit database.</message> + <message>2. Truncate audit table.</message> + <message>3. Follow upgrade process and once completed then restore audit data to audit table.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/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 91c8cdf..4e897a0 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 @@ -90,11 +90,12 @@ <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. - If audit database size is too large( > 3GB ) then follow the below instructions: - 1. Backup the audit table from audit database. - 2. Truncate audit table. - 3. Follow upgrade process and once completed then restore audit data to audit table.</message> + <message> + Before continuing, please backup the Ranger Admin database and Ranger Audit database. If audit database size is too large( > 3GB ) then follow the below instructions: + </message> + <message>1. Backup the audit table from audit database.</message> + <message>2. Truncate audit table.</message> + <message>3. Follow upgrade process and once completed then restore audit data to audit table.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml index fd93829..9396f80 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml @@ -102,11 +102,10 @@ <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. - If audit database size is too large( > 3GB ) then follow the below instructions: - 1. Backup the audit table from audit database. - 2. Truncate audit table. - 3. Follow upgrade process and once completed then restore audit data to audit table.</message> + <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database. If audit database size is too large( > 3GB ) then follow the below instructions:</message> + <message>1. Backup the audit table from audit database.</message> + <message>2. Truncate audit table.</message> + <message>3. Follow upgrade process and once completed then restore audit data to audit table.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml index c27b634..04a201b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml @@ -104,11 +104,10 @@ <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. - If audit database size is too large( > 3GB ) then follow the below instructions: - 1. Backup the audit table from audit database. - 2. Truncate audit table. - 3. Follow upgrade process and once completed then restore audit data to audit table.</message> + <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database. If audit database size is too large( > 3GB ) then follow the below instructions:</message> + <message>1. Backup the audit table from audit database.</message> + <message>2. Truncate audit table.</message> + <message>3. Follow upgrade process and once completed then restore audit data to audit table.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml index 708c011..10f07f9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml @@ -94,11 +94,11 @@ <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. - If audit database size is too large( > 3GB ) then follow the below instructions: - 1. Backup the audit table from audit database. - 2. Truncate audit table. - 3. Follow upgrade process and once completed then restore audit data to audit table.</message> + <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database. If audit database size is too large( > 3GB ) then follow the below instructions: + </message> + <message>1. Backup the audit table from audit database.</message> + <message>2. Truncate audit table.</message> + <message>3. Follow upgrade process and once completed then restore audit data to audit table.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml index b1325b9..a642320 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml @@ -98,11 +98,10 @@ <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. - If audit database size is too large( > 3GB ) then follow the below instructions: - 1. Backup the audit table from audit database. - 2. Truncate audit table. - 3. Follow upgrade process and once completed then restore audit data to audit table.</message> + <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database. If audit database size is too large( > 3GB ) then follow the below instructions:</message> + <message>1. Backup the audit table from audit database.</message> + <message>2. Truncate audit table.</message> + <message>3. Follow upgrade process and once completed then restore audit data to audit table.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml index cb163e4..677e1eb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml @@ -104,11 +104,10 @@ <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. - If audit database size is too large( > 3GB ) then follow the below instructions: - 1. Backup the audit table from audit database. - 2. Truncate audit table. - 3. Follow upgrade process and once completed then restore audit data to audit table.</message> + <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database. If audit database size is too large( > 3GB ) then follow the below instructions:</message> + <message>1. Backup the audit table from audit database.</message> + <message>2. Truncate audit table.</message> + <message>3. Follow upgrade process and once completed then restore audit data to audit table.</message> </task> </execute-stage>