ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject git commit: AMBARI-8151. Slider View: /slider/apptypes returns unsecured configs when cluster is secured and ambari-server not restarted (srimanth)
Date Tue, 04 Nov 2014 23:03:47 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 e05f5cdd3 -> 76556d8c6


AMBARI-8151. Slider View: /slider/apptypes returns unsecured configs when cluster is secured
and ambari-server not restarted (srimanth)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/76556d8c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/76556d8c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/76556d8c

Branch: refs/heads/branch-1.7.0
Commit: 76556d8c6ce8630e441eb2d164ea554cc51821b4
Parents: e05f5cd
Author: Srimanth Gunturi <sgunturi@hortonworks.com>
Authored: Tue Nov 4 14:55:10 2014 -0800
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
Committed: Tue Nov 4 14:55:18 2014 -0800

----------------------------------------------------------------------
 .../view/slider/SliderAppsViewControllerImpl.java      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/76556d8c/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 0370372..1a52efa 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
@@ -944,14 +944,13 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController
{
 
   @Override
   public List<SliderAppType> getSliderAppTypes(Set<String> properties) {
-    Map<String, String> hadoopConfigs = getHadoopConfigs();
-    if(hadoopConfigs==null || hadoopConfigs.isEmpty()) {
-      try {
-        // Need to determine security enablement before loading app types
-        getViewStatus();
-      } catch (Throwable t) {
-      }
+    try {
+      // Need to determine security enablement before loading app types
+      getViewStatus();
+    } catch (Throwable t) {
+      logger.warn("Unable to determine if cluster is secured when loading app-types", t);
     }
+    Map<String, String> hadoopConfigs = getHadoopConfigs();
     final boolean securityEnabled = Boolean.valueOf(hadoopConfigs.get("security_enabled"));
     if (appTypes == null) {
       appTypes = loadAppTypes();


Mime
View raw message