Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7B5A8176BB for ; Tue, 27 Oct 2015 19:03:25 +0000 (UTC) Received: (qmail 48849 invoked by uid 500); 27 Oct 2015 19:02:51 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 48791 invoked by uid 500); 27 Oct 2015 19:02:51 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 48782 invoked by uid 99); 27 Oct 2015 19:02:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Oct 2015 19:02:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6984E0061; Tue, 27 Oct 2015 19:02:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aw@apache.org To: common-commits@hadoop.apache.org Message-Id: <0f4ea4ea5f1143afa36e67a0d1b141fd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-12494. fetchdt stores the token based on token kind instead of token service (HeeSoo Kim via aw) Date: Tue, 27 Oct 2015 19:02:50 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk faeb6a3f8 -> 1396867b5 HADOOP-12494. fetchdt stores the token based on token kind instead of token service (HeeSoo Kim via aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1396867b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1396867b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1396867b Branch: refs/heads/trunk Commit: 1396867b52533ecf894158a464c6cd3abc7041b9 Parents: faeb6a3 Author: Allen Wittenauer Authored: Tue Oct 27 12:01:50 2015 -0700 Committer: Allen Wittenauer Committed: Tue Oct 27 12:02:43 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1396867b/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 9ba6275..e1addb2 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -516,6 +516,9 @@ Trunk (Unreleased) HADOOP-12515. Mockito dependency is missing in hadoop-kafka module. (Kai Zheng via aajisaka) + HADOOP-12494. fetchdt stores the token based on token kind instead + of token service (HeeSoo Kim via aw) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) http://git-wip-us.apache.org/repos/asf/hadoop/blob/1396867b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java index 803402d..39821aa 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java @@ -178,7 +178,7 @@ public class DelegationTokenFetcher { Token token = fs.getDelegationToken(renewer); if (null != token) { Credentials cred = new Credentials(); - cred.addToken(token.getKind(), token); + cred.addToken(token.getService(), token); cred.writeTokenStorageFile(tokenFile, conf); if (LOG.isDebugEnabled()) {