Repository: ambari Updated Branches: refs/heads/trunk acde08995 -> ed612008a
AMBARI-20832. Desired configs fetched in loop via HostResourceProvider.getHosts Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed612008 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed612008 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed612008 Branch: refs/heads/trunk Commit: ed612008ab664f59a06a5c609dfbe317c6a59948 Parents: acde089 Author: Attila Doroszlai <[email protected]> Authored: Mon Apr 24 16:36:36 2017 +0200 Committer: Attila Doroszlai <[email protected]> Committed: Tue Apr 25 09:11:19 2017 +0200 ---------------------------------------------------------------------- .../ambari/server/controller/internal/HostResourceProvider.java | 4 ++-- .../server/controller/internal/HostResourceProviderTest.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ed612008/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java index f604a7f..c244107 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java @@ -654,7 +654,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider { // retrieve the cluster desired configs once instead of per host Map<String, DesiredConfig> desiredConfigs = null; if (null != cluster) { - cluster.getDesiredConfigs(); + desiredConfigs = cluster.getDesiredConfigs(); } for (Host h : hosts) { @@ -678,7 +678,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider { if (clustersForHost != null && clustersForHost.size() != 0) { Cluster clusterForHost = clustersForHost.iterator().next(); r.setClusterName(clusterForHost.getClusterName()); - r.setDesiredHostConfigs(h.getDesiredHostConfigs(clusterForHost, desiredConfigs)); + r.setDesiredHostConfigs(h.getDesiredHostConfigs(clusterForHost, null)); r.setMaintenanceState(h.getMaintenanceState(clusterForHost.getClusterId())); } http://git-wip-us.apache.org/repos/asf/ambari/blob/ed612008/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java index ac6ac1d..8772b24 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java @@ -1145,6 +1145,8 @@ public class HostResourceProviderTest extends EasyMockSupport { HostResponse response = createNiceMock(HostResponse.class); Set<Cluster> setCluster = Collections.singleton(cluster); + Map<String, DesiredConfig> desiredConfigs = new HashMap<>(); + Map<String, HostConfig> desiredHostConfigs = new HashMap<>(); // requests HostRequest request1 = new HostRequest("host1", "cluster1", Collections.<String, String>emptyMap()); @@ -1160,7 +1162,8 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(clusters.getClustersForHost("host1")).andReturn(setCluster); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(desiredConfigs); + expect(host.getDesiredHostConfigs(cluster, desiredConfigs)).andReturn(desiredHostConfigs); expect(host.getHostName()).andReturn("host1").anyTimes(); expect(host.convertToResponse()).andReturn(response); response.setClusterName("cluster1");
