Repository: ambari Updated Branches: refs/heads/trunk 15c0a7f2f -> 8a72bff6d
AMBARI-18043. Not able to proceed with RU downgrade due to spark clients failing to install (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a72bff6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a72bff6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a72bff6 Branch: refs/heads/trunk Commit: 8a72bff6d59c2779846846a31114437c63379dfb Parents: 15c0a7f Author: Andrew Onishuk <[email protected]> Authored: Fri Aug 5 16:56:06 2016 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Fri Aug 5 16:56:06 2016 +0300 ---------------------------------------------------------------------- .../main/python/resource_management/libraries/functions/version.py | 2 +- .../common-services/SPARK/1.2.1/package/scripts/params.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8a72bff6/ambari-common/src/main/python/resource_management/libraries/functions/version.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/version.py b/ambari-common/src/main/python/resource_management/libraries/functions/version.py index 01daf08..2500430 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/version.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/version.py @@ -42,7 +42,7 @@ def format_stack_version(input): if input: if "-" in input: input_array = input.split("-") - input = input_array[1] + input = input_array[0] input = re.sub(r'^\D+', '', input) input = re.sub(r'\D+$', '', input) http://git-wip-us.apache.org/repos/asf/ambari/blob/8a72bff6/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py index 6e287b4..6d372e2 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py @@ -57,7 +57,7 @@ stack_name = status_params.stack_name stack_root = Script.get_stack_root() stack_version_unformatted = config['hostLevelParams']['stack_version'] if upgrade_direction == Direction.DOWNGRADE: - stack_version_unformatted = config['commandParams']['original_stack'] + stack_version_unformatted = config['commandParams']['original_stack'].split("-")[1] stack_version_formatted = format_stack_version(stack_version_unformatted) host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
