diff options
| author | Andrew Onishuk <aonishuk@hortonworks.com> | 2016-08-05 14:38:44 +0300 |
|---|---|---|
| committer | Andrew Onishuk <aonishuk@hortonworks.com> | 2016-08-05 14:38:44 +0300 |
| commit | 6fcdbd42ccb3926b8e4f121a0cbe5d9832235ffc (patch) | |
| tree | 84d2a3d3d3824a3ed192f29d3a148ae2031954d6 | |
| parent | 79a8296a5883fb04a91f3ef8472d193deacd987f (diff) | |
AMBARI-18043. Not able to proceed with RU downgrade due to spark clients failing to install (aonishuk)
| -rw-r--r-- | ambari-common/src/main/python/resource_management/libraries/functions/version.py | 2 | ||||
| -rw-r--r-- | ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py | 5 |
2 files changed, 6 insertions, 1 deletions
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 250043084a..01daf08a78 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[0] + input = input_array[1] input = re.sub(r'^\D+', '', input) input = re.sub(r'\D+$', '', input) 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 98a678ee93..663664350f 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 @@ -22,6 +22,7 @@ limitations under the License. import status_params from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions import Direction from setup_spark import * import resource_management.libraries.functions @@ -51,9 +52,13 @@ component_directory = Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, config = Script.get_config() tmp_dir = Script.get_tmp_dir() +upgrade_direction = default("/commandParams/upgrade_direction", None) + 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_formatted = format_stack_version(stack_version_unformatted) host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False) |