Repository: ambari Updated Branches: refs/heads/trunk bc0bbca97 -> 7102a7765
AMBARI-11370. Agent configs upgrade fails on upgrade 1.6.0 -> 2.0.1 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7102a776 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7102a776 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7102a776 Branch: refs/heads/trunk Commit: 7102a7765be17338d5d2d4d6ce4558dcfc30e93b Parents: bc0bbca Author: Andrew Onishuk <[email protected]> Authored: Mon May 25 17:14:55 2015 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Mon May 25 17:14:55 2015 +0300 ---------------------------------------------------------------------- ambari-agent/conf/unix/upgrade_agent_configs.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7102a776/ambari-agent/conf/unix/upgrade_agent_configs.py ---------------------------------------------------------------------- diff --git a/ambari-agent/conf/unix/upgrade_agent_configs.py b/ambari-agent/conf/unix/upgrade_agent_configs.py index 8b7be7a..583b5aa 100644 --- a/ambari-agent/conf/unix/upgrade_agent_configs.py +++ b/ambari-agent/conf/unix/upgrade_agent_configs.py @@ -23,6 +23,9 @@ import ConfigParser PROPERTIES_TO_REWRITE = [ ('heartbeat', 'dirs') ] +SECTIONS_TO_REMOVE = [ + 'stack', 'puppet', 'command', 'python' +] CONFIG_FILE_BACKUP = '/etc/ambari-agent/conf/ambari-agent.ini.old' CONFIG_FILE = '/etc/ambari-agent/conf/ambari-agent.ini' @@ -30,7 +33,7 @@ CONFIG_FILE = '/etc/ambari-agent/conf/ambari-agent.ini' if os.path.isfile(CONFIG_FILE_BACKUP): if os.path.isfile(CONFIG_FILE): print "Upgrading configs in {0}".format(CONFIG_FILE) - print "Values will be updated from {0} except the following list: {1}".format(CONFIG_FILE_BACKUP, PROPERTIES_TO_REWRITE) + print "Values will be updated from {0} except the following list: {1}, {2}".format(CONFIG_FILE_BACKUP, PROPERTIES_TO_REWRITE, SECTIONS_TO_REMOVE) agent_config_backup = ConfigParser.ConfigParser() agent_config_backup.read(CONFIG_FILE_BACKUP) @@ -40,8 +43,12 @@ if os.path.isfile(CONFIG_FILE_BACKUP): for section in agent_config_backup.sections(): for (property_name, property_val) in agent_config_backup.items(section): - if (section, property_name) not in PROPERTIES_TO_REWRITE: - agent_config.set(section, property_name, property_val) + if section not in SECTIONS_TO_REMOVE and (section, property_name) not in PROPERTIES_TO_REWRITE: + try: + agent_config.set(section, property_name, property_val) + except ConfigParser.NoSectionError: + agent_config.add_section(section) + agent_config.set(section, property_name, property_val) with (open(CONFIG_FILE, "wb")) as new_agent_config: agent_config.write(new_agent_config)
