Repository: zeppelin Updated Branches: refs/heads/master 3f9ef6e62 -> db7fbf276
[HOTFIX][ZEPPELIN-2760] fix JDBC regression caused after ZEPPELIN-2698 ### What is this PR for? This is WRT to https://github.com/apache/zeppelin/commit/e1f0a3205eb5aede0b2d80c9d3de59b3f47b699c#commitcomment-23016062 > This caused a regression: https://github.com/apache/zeppelin/blame/master/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java#L212 Leads to: java.lang.NoClassDefFoundError: org/apache/hadoop/security/UserGroupInformation$AuthenticationMethod at org.apache.zeppelin.jdbc.security.JDBCSecurityImpl.getAuthtype(JDBCSecurityImpl.java:64) at org.apache.zeppelin.jdbc.JDBCInterpreter.isKerboseEnabled(JDBCInterpreter.java:213) ### What type of PR is it? [Bug Fix | Hot Fix] ### What is the Jira issue? * [ZEPPELIN-2760](https://issues.apache.org/jira/browse/ZEPPELIN-2760) ### How should this be tested? Check JDBC interpreter without any Kerberos setting ### Questions: * Does the licenses files need update? N/A * Is there breaking changes for older versions? N/A * Does this needs documentation? N/A Author: Prabhjyot Singh <prabhjyotsi...@gmail.com> Closes #2481 from prabhjyotsingh/hotfix/jdbc_ZEPPELIN-2698 and squashes the following commits: abbf028b9 [Prabhjyot Singh] add isEmpty check Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/db7fbf27 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/db7fbf27 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/db7fbf27 Branch: refs/heads/master Commit: db7fbf2768fcdd7af02073ff446f7ae3dbdaf4f8 Parents: 3f9ef6e Author: Prabhjyot Singh <prabhjyotsi...@gmail.com> Authored: Tue Jul 11 08:37:39 2017 +0530 Committer: Prabhjyot Singh <prabhjyotsi...@gmail.com> Committed: Thu Jul 13 13:43:26 2017 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/db7fbf27/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java index 948914f..3483b4b 100644 --- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java +++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java @@ -210,9 +210,11 @@ public class JDBCInterpreter extends KerberosInterpreter { protected boolean isKerboseEnabled() { - UserGroupInformation.AuthenticationMethod authType = JDBCSecurityImpl.getAuthtype(property); - if (authType.equals(KERBEROS)) { - return true; + if (!isEmpty(property.getProperty("zeppelin.jdbc.auth.type"))) { + UserGroupInformation.AuthenticationMethod authType = JDBCSecurityImpl.getAuthtype(property); + if (authType.equals(KERBEROS)) { + return true; + } } return false; }
