AMBARI-21658. Check for config group host mapping left behind after host delete. Addendum to output message. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a43a9564 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a43a9564 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a43a9564 Branch: refs/heads/branch-2.6 Commit: a43a9564ca0b7874a32e981f647d3c26bb9a6dc3 Parents: 30bea53 Author: Siddharth Wagle <[email protected]> Authored: Thu Aug 3 22:29:14 2017 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Thu Aug 3 22:29:14 2017 -0700 ---------------------------------------------------------------------- .../ambari/server/checks/DatabaseConsistencyCheckHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a43a9564/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java index d546169..533fad7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java @@ -1168,6 +1168,7 @@ public class DatabaseConsistencyCheckHelper { // in the host table Map<Long, Host> hosts = configGroup.getHosts(); boolean addToOutput = false; + Set<String> hostnames = new HashSet<>(); if (!MapUtils.isEmpty(hosts)) { for (Host host : hosts.values()) { // Lookup by hostname - It does have a unique constraint @@ -1178,6 +1179,7 @@ public class DatabaseConsistencyCheckHelper { nonMappedHostIds.put(configGroup.getId(), hostIds); } hostIds.add(host.getHostId()); + hostnames.add(host.getHostName()); addToOutput = true; } } @@ -1188,7 +1190,7 @@ public class DatabaseConsistencyCheckHelper { output.append(", "); output.append(configGroup.getTag()); output.append(", "); - output.append(nonMappedHostIds.get(configGroup.getId()).size()); + output.append(hostnames); output.append(" ), "); } }
