AMBARI-20232 Updating text for Ranger Admin manual task for upgrade (mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aaec58b7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aaec58b7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aaec58b7 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: aaec58b73a2a06b748e87e2fff1b5e6bfd9177da Parents: 5f5762c Author: Mugdha Varadkar <[email protected]> Authored: Tue Feb 28 17:41:56 2017 +0530 Committer: Mugdha Varadkar <[email protected]> Committed: Wed Mar 1 13:49:04 2017 +0530 ---------------------------------------------------------------------- .../main/resources/common-services/RANGER/0.6.0/metainfo.xml | 2 -- .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 5 +---- .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 5 +---- .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 6 +----- .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 6 +----- .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 5 +---- .../src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 6 +----- 7 files changed, 6 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/aaec58b7/ambari-server/src/main/resources/common-services/RANGER/0.6.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/metainfo.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/metainfo.xml index 12fde7e..f330bc9 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/metainfo.xml @@ -110,8 +110,6 @@ <configuration-dependencies> <config-type>admin-log4j</config-type> <config-type>usersync-log4j</config-type> - <config-type>ranger-hdfs-plugin-properties</config-type> - <config-type>ranger-hbase-plugin-properties</config-type> </configuration-dependencies> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/aaec58b7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml index f5152a1..2dbc468 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml @@ -164,10 +164,7 @@ <execute-stage service="RANGER" component="RANGER_ADMIN" title="Backup Ranger Database"> <task xsi:type="manual"> - <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database on the following host(s): {{hosts.all}}. If audit database size is too large (greater than 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 on the following host(s): {{hosts.all}}.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/aaec58b7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml index d396033..8e98ba8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml @@ -170,10 +170,7 @@ <execute-stage service="RANGER" component="RANGER_ADMIN" title="Backup Ranger Database"> <task xsi:type="manual"> - <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database on the following host(s): {{hosts.all}}. If audit database size is too large (greater than 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 on the following host(s): {{hosts.all}}.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/aaec58b7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml index b1bbe16..a102d13 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml @@ -94,11 +94,7 @@ <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 on the following host(s): {{hosts.all}}.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/aaec58b7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml index c01d11e..c1e8f8e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml @@ -88,11 +88,7 @@ <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 on the following host(s): {{hosts.all}}.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/aaec58b7/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml index 921e479..035cb59 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml @@ -170,10 +170,7 @@ <execute-stage service="RANGER" component="RANGER_ADMIN" title="Backup Ranger Database"> <task xsi:type="manual"> - <message>Before continuing, please backup the Ranger Admin database and Ranger Audit database on the following host(s): {{hosts.all}}. If audit database size is too large (greater than 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 on the following host(s): {{hosts.all}}.</message> </task> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/aaec58b7/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml index 8669d2b..458667d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml @@ -87,11 +87,7 @@ <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 on the following host(s): {{hosts.all}}.</message> </task> </execute-stage>
