AMBARI-8048. Difference between core-site.xml, oozie-site.xml, hive-site.xml, hbase-site.xml from host and from UI (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9e3d0c1b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9e3d0c1b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9e3d0c1b Branch: refs/heads/trunk Commit: 9e3d0c1b30ee47b8f18915ec5eeb7d5ee75b360a Parents: b2aec15 Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Oct 30 21:05:52 2014 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Oct 30 21:08:08 2014 +0200 ---------------------------------------------------------------------- .../controller/internal/ClientConfigResourceProvider.java | 8 ++++++-- .../internal/ClientConfigResourceProviderTest.java | 8 +++++--- 2 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9e3d0c1b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java index 0adc52d..94c0d58 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java @@ -158,10 +158,14 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv Map<String, Map<String, String>> configurations = new TreeMap<String, Map<String, String>>(); Map<String, Map<String, Map<String, String>>> configurationAttributes = new TreeMap<String, Map<String, Map<String, String>>>(); - Collection<Config> clusterConfigs = cluster.getAllConfigs(); + Map<String, DesiredConfig> desiredClusterConfigs = cluster.getDesiredConfigs(); //Get configurations and configuration attributes - for (Config clusterConfig : clusterConfigs) { + for (Map.Entry<String, DesiredConfig> desiredConfigEntry : desiredClusterConfigs.entrySet()) { + + String configType = desiredConfigEntry.getKey(); + DesiredConfig desiredConfig = desiredConfigEntry.getValue(); + Config clusterConfig = cluster.getConfig(configType, desiredConfig.getTag()); if (clusterConfig != null) { Map<String, String> props = new HashMap<String, String>(clusterConfig.getProperties()); http://git-wip-us.apache.org/repos/asf/ambari/blob/9e3d0c1b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java index 0e27dcf..d73eea4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java @@ -143,6 +143,7 @@ public class ClientConfigResourceProviderTest { ServiceInfo serviceInfo = createNiceMock(ServiceInfo.class); CommandScriptDefinition commandScriptDefinition = createNiceMock(CommandScriptDefinition.class); Config clusterConfig = createNiceMock(Config.class); + DesiredConfig desiredConfig = createNiceMock(DesiredConfig.class); Host host = createNiceMock(Host.class); Service service = createNiceMock(Service.class); ServiceComponent serviceComponent = createNiceMock(ServiceComponent.class); @@ -155,8 +156,8 @@ public class ClientConfigResourceProviderTest { Runtime runtime = createMock(Runtime.class); Process process = createNiceMock(Process.class); - Collection<Config> clusterConfigs = new HashSet<Config>(); - clusterConfigs.add(clusterConfig); + Map<String, DesiredConfig> desiredConfigMap = new HashMap<String, DesiredConfig>(); + desiredConfigMap.put("hive-site", desiredConfig); Map<String, Map<String, String>> allConfigTags = new HashMap<String, Map<String, String>>(); Map<String, Map<String, String>> properties = new HashMap<String, Map<String, String>>(); Map<String, Map<String, String>> configTags = new HashMap<String, @@ -262,7 +263,8 @@ public class ClientConfigResourceProviderTest { expect(componentInfo.getCommandScript()).andReturn(commandScriptDefinition); expect(componentInfo.getClientConfigFiles()).andReturn(clientConfigFileDefinitionList); expect(ambariMetaInfo.getStackRoot()).andReturn(new File(stackRoot)); - expect(cluster.getAllConfigs()).andReturn(clusterConfigs); + expect(cluster.getConfig("hive-site", null)).andReturn(clusterConfig); + expect(cluster.getDesiredConfigs()).andReturn(desiredConfigMap); expect(clusters.getHostsForCluster(clusterName)).andReturn(hosts); expect(clusters.getHost(hostName)).andReturn(host);
