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-14239 - Unit tests fail for upgrade operations in branch-2.2 (jonathanhurley)
Date Sun, 06 Dec 2015 20:28:42 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 c6fecb777 -> 5152f891c


AMBARI-14239 - Unit tests fail for upgrade operations in branch-2.2 (jonathanhurley)


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

Branch: refs/heads/branch-2.2
Commit: 5152f891c6dda8abd5ca8572fd212b5a8f549620
Parents: c6fecb7
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Sun Dec 6 15:21:15 2015 -0500
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Sun Dec 6 15:21:15 2015 -0500

----------------------------------------------------------------------
 .../common-services/KNOX/0.5.0.2.2/package/scripts/upgrade.py   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5152f891/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/upgrade.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/upgrade.py
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/upgrade.py
index 84849a4..f3bb6c6 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/upgrade.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/upgrade.py
@@ -81,14 +81,13 @@ def _get_directory_mappings_during_upgrade():
   # By default, use this for all stacks.
   knox_data_dir = '/var/lib/knox/data'
 
-  directories = {}
   if params.stack_name and params.stack_name.upper() == "HDP" and \
           compare_versions(format_hdp_stack_version(params.upgrade_from_version), "2.3.0.0")
> 0:
     # Use the version that is being upgraded from.
     knox_data_dir = format('/usr/hdp/{upgrade_from_version}/knox/data')
 
-    # the trailing "/" is important here so as to not include the "conf" folder itself
-    directories = {knox_data_dir: BACKUP_DATA_ARCHIVE, params.knox_conf_dir + "/": BACKUP_CONF_ARCHIVE}
+  # the trailing "/" is important here so as to not include the "conf" folder itself
+  directories = {knox_data_dir: BACKUP_DATA_ARCHIVE, params.knox_conf_dir + "/": BACKUP_CONF_ARCHIVE}
 
   Logger.info(format("Knox directories to backup:\n{directories}"))
   return directories


Mime
View raw message