AMBARI-18637: Management pack purge option should warn user and ask for confirmation before purging - addendum (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/56b4d57d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/56b4d57d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/56b4d57d Branch: refs/heads/branch-dev-patch-upgrade Commit: 56b4d57dcf747ee84b07a24a6f663254ab1eeaff Parents: 5454bd6 Author: Jayush Luniya <[email protected]> Authored: Tue Nov 15 23:25:44 2016 -0800 Committer: Jayush Luniya <[email protected]> Committed: Tue Nov 15 23:30:46 2016 -0800 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari_server/setupMpacks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/56b4d57d/ambari-server/src/main/python/ambari_server/setupMpacks.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/setupMpacks.py b/ambari-server/src/main/python/ambari_server/setupMpacks.py old mode 100644 new mode 100755 index b6d9051..3b8a67a --- a/ambari-server/src/main/python/ambari_server/setupMpacks.py +++ b/ambari-server/src/main/python/ambari_server/setupMpacks.py @@ -640,9 +640,7 @@ def _install_mpack(options, replay_mode=False, is_upgrade=False): _execute_hook(mpack_metadata, BEFORE_INSTALL_HOOK_NAME, tmp_root_dir) # Purge previously installed stacks and management packs - if options.purge: - if not 'purge_list' in options: - options.purge_list = ",".join([STACK_DEFINITIONS_RESOURCE_NAME, MPACKS_RESOURCE_NAME]) + if options.purge and options.purge_list: purge_resources = options.purge_list.split(",") validate_purge(options, purge_resources, tmp_root_dir, mpack_metadata, replay_mode) purge_stacks_and_mpacks(purge_resources, replay_mode) @@ -827,6 +825,8 @@ def replay_mpack_logs(): print_info_msg(replay_log) print_info_msg("===========================================================================================") replay_options = _named_dict(ast.literal_eval(replay_log)) + if 'purge_list' not in replay_options: + replay_options.purge_list = ",".join([STACK_DEFINITIONS_RESOURCE_NAME, MPACKS_RESOURCE_NAME]) if replay_options.mpack_command == INSTALL_MPACK_ACTION: install_mpack(replay_options, replay_mode=True) elif replay_options.mpack_command == UPGRADE_MPACK_ACTION:
