AMBARI-21188 - Configuration Symlink Is Incorrect After Stack Distribution (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7750c9a4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7750c9a4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7750c9a4 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 7750c9a4672e692f6389698698335596d8bf4925 Parents: 5a1bd71 Author: Jonathan Hurley <[email protected]> Authored: Tue Jun 6 14:42:20 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Tue Jun 6 14:42:20 2017 -0400 ---------------------------------------------------------------------- .../libraries/functions/conf_select.py | 1 - .../custom_actions/scripts/install_packages.py | 17 +++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7750c9a4/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py index facf186..3e01cf6 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py @@ -26,7 +26,6 @@ import os import subprocess # Local Imports -import version import stack_select from resource_management.core import shell from resource_management.libraries.functions.format import format http://git-wip-us.apache.org/repos/asf/ambari/blob/7750c9a4/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py index c12dff1..d6da0fc 100644 --- a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py +++ b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py @@ -197,18 +197,11 @@ class InstallPackages(Script): return for package_name, directories in conf_select.get_package_dirs().iteritems(): - # if already on HDP 2.3, then we should skip making conf.backup folders - if self.current_stack_version_formatted and check_stack_feature(StackFeature.CONFIG_VERSIONING, self.current_stack_version_formatted): - conf_selector_name = stack_tools.get_stack_tool_name(stack_tools.CONF_SELECTOR_NAME) - Logger.info("The current cluster stack of {0} does not require backing up configurations; " - "only {1} versioned config directories will be created.".format(stack_version, conf_selector_name)) - # only link configs for all known packages - conf_select.select(self.stack_name, package_name, stack_version, ignore_errors = True) - else: - # link configs and create conf.backup folders for all known packages - # this will also call conf-select select - conf_select.convert_conf_directories_to_symlinks(package_name, stack_version, directories, - skip_existing_links = False, link_to = "backup") + conf_selector_name = stack_tools.get_stack_tool_name(stack_tools.CONF_SELECTOR_NAME) + Logger.info("The current cluster stack of {0} does not require backing up configurations; " + "only {1} versioned config directories will be created.".format(stack_version, conf_selector_name)) + # only link configs for all known packages + conf_select.select(self.stack_name, package_name, stack_version, ignore_errors = True) def compute_actual_version(self):
