----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/47235/ -----------------------------------------------------------
(Updated May 16, 2016, 9:19 a.m.) Review request for Ambari, Srimanth Gunturi and Sid Wagle. Summary (updated) ----------------- Takeover script configs results in conflict message that look wrong Bugs: AMBARI-16451 https://issues.apache.org/jira/browse/AMBARI-16451 Repository: ambari Description ------- Attaching the zip file with configs and conflicts. * The conflicting configs seem to have a lot of duplicate info mapred-site :: dfs.datanode.du.reserved * Unable to handle empty config files: Had to hand edit and add try / catch at : > yaml.load(file).iteritems() > parsed_configurations_from_path, parsed_properties_attributes = parser.read_data_to_map(path) Traceback (most recent call last): File "./takeover_config_merge.py", line 393, in <module> sys.exit(main()) File "./takeover_config_merge.py", line 389, in main return configMerge.perform_merge() File "./takeover_config_merge.py", line 279, in perform_merge parsed_configurations_from_path, parsed_properties_attributes = parser.read_data_to_map(path) File "./takeover_config_merge.py", line 86, in read_data_to_map for name, value in yaml.load(file).iteritems(): AttributeError: 'NoneType' object has no attribute 'iteritems' _Instruction_ ./takeover_config_merge.py -o blueprint -i files Diffs ----- ambari-server/src/main/resources/scripts/takeover_config_merge.py 1432e4b Diff: https://reviews.apache.org/r/47235/diff/ Testing ------- mvn clean test Thanks, Andrew Onischuk