Repository: ambari Updated Branches: refs/heads/branch-2.4 655ee6a33 -> 37747e84c
AMBARI-17056. View config-Custom views are not working after kerberization. (Gaurav Nagar via pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37747e84 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37747e84 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37747e84 Branch: refs/heads/branch-2.4 Commit: 37747e84c8b22f7eee5a547ba8e9688c23cec5db Parents: 655ee6a Author: Pallav Kulshreshtha <[email protected]> Authored: Wed Jun 8 18:23:01 2016 +0530 Committer: Pallav Kulshreshtha <[email protected]> Committed: Wed Jun 8 18:24:20 2016 +0530 ---------------------------------------------------------------------- .../ambari/view/hive/client/ConnectionFactory.java | 2 +- .../view/utils/hdfs/AuthConfigurationBuilder.java | 17 +++++++++-------- .../view/utils/hdfs/ConfigurationBuilder.java | 4 +--- 3 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/37747e84/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/client/ConnectionFactory.java ---------------------------------------------------------------------- diff --git a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/client/ConnectionFactory.java b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/client/ConnectionFactory.java index 0eb7906..d3cbb08 100644 --- a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/client/ConnectionFactory.java +++ b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/client/ConnectionFactory.java @@ -113,7 +113,7 @@ public class ConnectionFactory implements UserLocalFactory<Connection> { if ((auth == null || auth.isEmpty()) && context.getCluster() != null) { params.putAll(getDefaultAuthParams()); } else if(auth == null || auth.isEmpty()) { - params.put("auth","NOSASL"); + params.put("auth","NONE"); } else { for (String param : auth.split(";")) { String[] keyvalue = param.split("="); http://git-wip-us.apache.org/repos/asf/ambari/blob/37747e84/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/AuthConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/AuthConfigurationBuilder.java b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/AuthConfigurationBuilder.java index 10ec1fb..1c662cc 100644 --- a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/AuthConfigurationBuilder.java +++ b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/AuthConfigurationBuilder.java @@ -18,6 +18,7 @@ package org.apache.ambari.view.utils.hdfs; +import com.google.common.base.Strings; import org.apache.ambari.view.ViewContext; import org.apache.ambari.view.utils.ambari.AmbariApi; import org.apache.ambari.view.utils.ambari.NoClusterAssociatedException; @@ -38,11 +39,9 @@ public class AuthConfigurationBuilder { private Map<String, String> params = new HashMap<String, String>(); private ViewContext context; - private AmbariApi ambariApi; public AuthConfigurationBuilder(ViewContext context) { this.context = context; - this.ambariApi = new AmbariApi(context); } /** @@ -54,13 +53,15 @@ public class AuthConfigurationBuilder { String auth; auth = context.getProperties().get("webhdfs.auth"); - if ((auth == null || auth.isEmpty()) && context.getCluster() != null) { - auth = getConfigurationFromAmbari(); - } else { - auth = "auth=SIMPLE"; - LOG.warn(String.format("HDFS090 Authentication parameters could not be determined. %s assumed.", auth)); + if (Strings.isNullOrEmpty(auth)) { + if (context.getCluster() != null) { + auth = getConfigurationFromAmbari(); + } else { + auth = "auth=SIMPLE"; + LOG.warn(String.format("HDFS090 Authentication parameters could not be determined. %s assumed.", auth)); + } } - + LOG.debug("Hdfs auth params : {}", auth); parseAuthString(auth); } http://git-wip-us.apache.org/repos/asf/ambari/blob/37747e84/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java index 9edf9d7..5d0c1d3 100644 --- a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java +++ b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java @@ -69,7 +69,7 @@ public class ConfigurationBuilder { public static final String DFS_WEBHDFS_ENABLED = "dfs.webhdfs.enabled"; public static final String DFS_HTTP_POLICY = "dfs.http.policy"; - public static final String DFS_HTTP_POLICY_HTTPS_ONLY = "HTTPS"; + public static final String DFS_HTTP_POLICY_HTTPS_ONLY = "HTTPS_ONLY"; public static final String DFS_NAMENODE_HTTP_ADDERSS = "dfs.namenode.http-address"; public static final String DFS_NAMENODE_HTTPS_ADDERSS = "dfs.namenode.https-address"; @@ -77,7 +77,6 @@ public class ConfigurationBuilder { private Configuration conf = new Configuration(); private ViewContext context; - private AmbariApi ambariApi = null; private AuthConfigurationBuilder authParamsBuilder; private Map<String, String> authParams; private URI defaultFsUri; @@ -87,7 +86,6 @@ public class ConfigurationBuilder { */ public ConfigurationBuilder(ViewContext context) { this.context = context; - this.ambariApi = new AmbariApi(context); this.authParamsBuilder = new AuthConfigurationBuilder(context); }
