AMBARI-6921. Slider Apps View is blocked by using old unnecessary global configs in code (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5aaa32c1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5aaa32c1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5aaa32c1 Branch: refs/heads/branch-alerts-dev Commit: 5aaa32c19fdca3811d0a942cb1589afbf0448534 Parents: 933f7f8 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Tue Aug 19 11:42:53 2014 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Tue Aug 19 11:50:35 2014 -0700 ---------------------------------------------------------------------- .../view/slider/SliderAppsViewControllerImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5aaa32c1/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java index adfa68f..0a3282f 100644 --- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java +++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java @@ -154,9 +154,9 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController { } // Check security if (cluster.getDesiredConfigs() != null - && cluster.getDesiredConfigs().containsKey("global")) { + && cluster.getDesiredConfigs().containsKey("hadoop-env")) { Map<String, String> globalConfig = ambariClient.getConfiguration( - clusterInfo, "global", cluster.getDesiredConfigs().get("global")); + clusterInfo, "hadoop-env", cluster.getDesiredConfigs().get("hadoop-env")); if (globalConfig != null && globalConfig.containsKey("security_enabled")) { String securityValue = globalConfig.get("security_enabled"); @@ -458,19 +458,19 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController { AmbariService zkService = ambariClient.getService(ambariCluster, "ZOOKEEPER"); if (zkService != null && ambariCluster.getDesiredConfigs() != null - && ambariCluster.getDesiredConfigs().containsKey("global") + && ambariCluster.getDesiredConfigs().containsKey("zookeeper-env") && ambariCluster.getDesiredConfigs().containsKey("yarn-site") && ambariCluster.getDesiredConfigs().containsKey("core-site")) { - Map<String, String> globalConfigs = ambariClient.getConfiguration( - ambariCluster, "global", - ambariCluster.getDesiredConfigs().get("global")); + Map<String, String> zkConfigs = ambariClient.getConfiguration( + ambariCluster, "zookeeper-env", + ambariCluster.getDesiredConfigs().get("zookeeper-env")); Map<String, String> yarnSiteConfigs = ambariClient.getConfiguration( ambariCluster, "yarn-site", ambariCluster.getDesiredConfigs().get("yarn-site")); Map<String, String> coreSiteConfigs = ambariClient.getConfiguration( ambariCluster, "core-site", ambariCluster.getDesiredConfigs().get("core-site")); - String zkPort = globalConfigs.get("clientPort"); + String zkPort = zkConfigs.get("clientPort"); String hdfsPath = coreSiteConfigs.get("fs.defaultFS"); String rmAddress = yarnSiteConfigs.get("yarn.resourcemanager.address"); String rmSchedulerAddress = yarnSiteConfigs