AMBARI-10762. Ambari Upgrade fails if existing properties file has content as attached in here. Ambari 1.7 to 2.0 Upgrade (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c32403f9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c32403f9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c32403f9 Branch: refs/heads/branch-2.0.maint Commit: c32403f90f2c13a5ed7cf45eb245be71adaee2e0 Parents: 97f91e7 Author: Lisnichenko Dmitro <[email protected]> Authored: Mon Apr 27 15:40:04 2015 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Mon Apr 27 15:41:22 2015 +0300 ---------------------------------------------------------------------- .../src/main/python/ambari_server/serverConfiguration.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c32403f9/ambari-server/src/main/python/ambari_server/serverConfiguration.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py index f73e75c..66e5c09 100644 --- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py +++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py @@ -782,9 +782,14 @@ def update_ambari_properties(): # Previous config file does not exist if (not prev_conf_file) or (prev_conf_file is None): - print_warning_msg("Can not find ambari.properties.backup file from previous version, skipping import of settings") + print_warning_msg("Can not find %s file from previous version, skipping import of settings" % configDefaults.AMBARI_PROPERTIES_BACKUP_FILE) return 0 + # ambari.properties file does not exists + if conf_file is None: + print_error_msg("Can't find %s file" % AMBARI_PROPERTIES_FILE) + return -1 + try: old_properties = Properties() old_properties.load(open(prev_conf_file))
