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 <a...@apache.org> Authored: Tue Oct 27 12:01:50 2015 -0700 Committer: Allen Wittenauer <a...@apache.org> 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()) {
