ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject ambari git commit: AMBARI-17557 - Hive WebHCat Service Check Fails During Upgrade Due To Missing Configurations Files (jonathanhurley)
Date Tue, 05 Jul 2016 17:49:48 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ef799757a -> ffc3c7111


AMBARI-17557 - Hive WebHCat Service Check Fails During Upgrade Due To Missing Configurations
Files (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: ffc3c7111208c4446174328300a099971c294a1a
Parents: ef79975
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Mon Jul 4 20:58:58 2016 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Tue Jul 5 13:49:39 2016 -0400

----------------------------------------------------------------------
 .../python/resource_management/libraries/functions/conf_select.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ffc3c711/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 c810438..109d71a 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
@@ -512,7 +512,6 @@ def convert_conf_directories_to_symlinks(package, version, dirs, skip_existing_l
     return
 
   # make backup dir and copy everything in case configure() was called after install()
-  backup_dir = None
   for dir_def in dirs:
     old_conf = dir_def['conf_dir']
     backup_dir = _get_backup_conf_directory(old_conf)
@@ -572,6 +571,8 @@ def convert_conf_directories_to_symlinks(package, version, dirs, skip_existing_l
       # or
       # link /etc/[component]/conf -> <stack-root>/current/[component]-client/conf
       if link_to == DIRECTORY_TYPE_BACKUP:
+        old_conf = dir_def['conf_dir']
+        backup_dir = _get_backup_conf_directory(old_conf)
         Link(new_symlink, to = backup_dir)
       else:
         Link(new_symlink, to = dir_def['current_dir'])


Mime
View raw message