Repository: hive Updated Branches: refs/heads/branch-1 494ab8db5 -> cb705ef40
HIVE-10992:WebHCat should not create delegation tokens when Kerberos is not enabled Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/cb705ef4 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/cb705ef4 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/cb705ef4 Branch: refs/heads/branch-1 Commit: cb705ef40475043f16891b8355b07038fd5d8d07 Parents: 494ab8d Author: Eugene Koifman <ekoif...@hortonworks.com> Authored: Sat Jun 13 10:35:57 2015 -0700 Committer: Eugene Koifman <ekoif...@hortonworks.com> Committed: Sat Jun 13 10:35:57 2015 -0700 ---------------------------------------------------------------------- .../hive/hcatalog/templeton/tool/TempletonControllerJob.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/cb705ef4/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java index 5c7de80..f47feeb 100644 --- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java +++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java @@ -133,9 +133,10 @@ public class TempletonControllerJob extends Configured implements Tool, JobSubmi JobClient jc = new JobClient(new JobConf(job.getConfiguration())); - Token<DelegationTokenIdentifier> mrdt = jc.getDelegationToken(new Text("mr token")); - job.getCredentials().addToken(new Text("mr token"), mrdt); - + if(UserGroupInformation.isSecurityEnabled()) { + Token<DelegationTokenIdentifier> mrdt = jc.getDelegationToken(new Text("mr token")); + job.getCredentials().addToken(new Text("mr token"), mrdt); + } String metastoreTokenStrForm = addHMSToken(job, user); job.submit();