You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2017/12/22 23:29:18 UTC
hive git commit: HIVE-18331 : Renew the Kerberos ticket used by Druid
Query runner (Slim Bouguerra via Sergey Shelukhin)
Repository: hive
Updated Branches:
refs/heads/master 5cd047b55 -> 035eca39f
HIVE-18331 : Renew the Kerberos ticket used by Druid Query runner (Slim Bouguerra via Sergey Shelukhin)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/035eca39
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/035eca39
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/035eca39
Branch: refs/heads/master
Commit: 035eca39fc0bd7aa0d9c1809a26e000ac52978d0
Parents: 5cd047b
Author: Slim Bouguerra <sl...@gmail.com>
Authored: Fri Dec 22 15:25:46 2017 -0800
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Fri Dec 22 15:25:46 2017 -0800
----------------------------------------------------------------------
.../hadoop/hive/druid/security/KerberosHttpClient.java | 1 +
.../hive/druid/security/ResponseCookieHandler.java | 11 +----------
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/035eca39/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java
----------------------------------------------------------------------
diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java
index 71bb8a2..e7b3d99 100644
--- a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java
+++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/KerberosHttpClient.java
@@ -100,6 +100,7 @@ public class KerberosHttpClient extends AbstractHttpClient
);
// Assuming that a valid UGI with kerberos cred is created by HS2 or LLAP
UserGroupInformation currentUser = UserGroupInformation.getCurrentUser();
+ currentUser.checkTGTAndReloginFromKeytab();
log.debug("The user credential is {}", currentUser);
String challenge = currentUser.doAs(new PrivilegedExceptionAction<String>()
{
http://git-wip-us.apache.org/repos/asf/hive/blob/035eca39/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java
----------------------------------------------------------------------
diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java
index b84c5e4..9d3798f 100644
--- a/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java
+++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/security/ResponseCookieHandler.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.hive.druid.security;
-import com.google.common.base.Function;
import com.google.common.collect.Maps;
import com.metamx.http.client.response.ClientResponse;
import com.metamx.http.client.response.HttpResponseHandler;
@@ -31,7 +30,6 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.CookieManager;
import java.net.URI;
-import java.util.List;
public class ResponseCookieHandler<Intermediate, Final> implements HttpResponseHandler<Intermediate, Final>
{
@@ -53,14 +51,7 @@ public class ResponseCookieHandler<Intermediate, Final> implements HttpResponseH
{
try {
final HttpHeaders headers = httpResponse.headers();
- manager.put(uri, Maps.asMap(headers.names(), new Function<String, List<String>>()
- {
- @Override
- public List<String> apply(String input)
- {
- return headers.getAll(input);
- }
- }));
+ manager.put(uri, Maps.asMap(headers.names(), input -> headers.getAll(input)));
}
catch (IOException e) {
log.error("Error while processing Cookies from header", e);