[17/51] [abbrv] ambari git commit: AMBARI-22665 - Livy2 Does Not Start On HDP 2.6.0 to 2.6.3 (jonathanhurley)

[am...@apache.org]

AMBARI-22665 - Livy2 Does Not Start On HDP 2.6.0 to 2.6.3 (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c95c4a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c95c4a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c95c4a7

Branch: refs/heads/branch-feature-AMBARI-22008-isilon
Commit: 5c95c4a7a9c75f0b0932b3accf4fb536a3175c0e
Parents: 2817ad4
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Dec 18 12:23:06 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Dec 18 15:53:26 2017 -0500

----------------------------------------------------------------------
 .../resource_management/libraries/functions/conf_select.py    | 7 +++++++
 .../main/resources/custom_actions/scripts/install_packages.py | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5c95c4a7/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 d38e273..9de2f8f 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
@@ -211,6 +211,13 @@ def convert_conf_directories_to_symlinks(package, version, dirs):
   # determine which directories would be created, if any are needed
   dry_run_directory = create(stack_name, package, version, dry_run = True)
 
+  # if the dry run reported an error, then we must assume that the package does not exist in
+  # the conf-select tool
+  if len(dry_run_directory) == 0:
+    Logger.info("The conf-select tool reported an error for the package {0}. The configuration linking will be skipped.".format(package))
+    return
+
+
   need_dirs = []
   for d in dry_run_directory:
     if not os.path.exists(d):

http://git-wip-us.apache.org/repos/asf/ambari/blob/5c95c4a7/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 c3fbc48..4cdb0e5 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
@@ -184,10 +184,10 @@ class InstallPackages(Script):
     from resource_management.libraries.functions import stack_select
     package_dirs = conf_select.get_package_dirs()
     if package_name in package_dirs:
-      Logger.info("Attempting to fix the default conf links for {0}".format(package_name))
+      Logger.info("Determining if the default conf links for {0} need to be fixed".format(package_name))
 
       directories = package_dirs[package_name]
-      Logger.info("The following directories will be fixed for {0}: {1}".format(package_name,
+      Logger.info("The following directories will be checked for {0}: {1}".format(package_name,
         str(directories)))
 
       stack_version = stack_select.get_stack_version_before_install(component_name)