Repository: hadoop Updated Branches: refs/heads/branch-2 3a0318ea9 -> c1447e654 refs/heads/trunk d66302ed9 -> b48908033
HDFS-2956. calling fetchdt without a --renewer argument throws NPE (Contributed by Vinayakumar B)HDFS-2956. calling fetchdt without a --renewer argument throws NPE (Contributed by Vinayakumar B) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b4890803 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b4890803 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b4890803 Branch: refs/heads/trunk Commit: b48908033fcac7a4bd4313c1fd1457999fba08e1 Parents: d66302e Author: Vinayakumar B <[email protected]> Authored: Fri Jul 10 15:47:04 2015 +0530 Committer: Vinayakumar B <[email protected]> Committed: Fri Jul 10 15:47:04 2015 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++ .../ClientNamenodeProtocolTranslatorPB.java | 2 +- .../hdfs/tools/TestDelegationTokenFetcher.java | 39 ++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4890803/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 5c1208d..13b2621 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1029,6 +1029,9 @@ Release 2.8.0 - UNRELEASED HDFS-8749. Fix findbugs warnings in BlockManager.java. (Brahma Reddy Battula via aajisaka) + HDFS-2956. calling fetchdt without a --renewer argument throws NPE + (vinayakumarb) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4890803/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java index 4ec6f9e..566d54f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java @@ -929,7 +929,7 @@ public class ClientNamenodeProtocolTranslatorPB implements throws IOException { GetDelegationTokenRequestProto req = GetDelegationTokenRequestProto .newBuilder() - .setRenewer(renewer.toString()) + .setRenewer(renewer == null ? "" : renewer.toString()) .build(); try { GetDelegationTokenResponseProto resp = rpcProxy.getDelegationToken(null, req); http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4890803/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDelegationTokenFetcher.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDelegationTokenFetcher.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDelegationTokenFetcher.java index ab3933b..80a1a6c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDelegationTokenFetcher.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDelegationTokenFetcher.java @@ -18,7 +18,10 @@ package org.apache.hadoop.hdfs.tools; +import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_DELEGATION_TOKEN_ALWAYS_USE_KEY; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; @@ -28,12 +31,18 @@ import java.io.IOException; import java.util.Iterator; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hdfs.DistributedFileSystem; +import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier; import org.apache.hadoop.hdfs.web.WebHdfsFileSystem; import org.apache.hadoop.io.Text; +import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.token.Token; +import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.tools.FakeRenewer; import org.junit.Assert; import org.junit.Rule; @@ -105,4 +114,34 @@ public class TestDelegationTokenFetcher { Assert.assertFalse(p.getFileSystem(conf).exists(p)); } + + @Test + public void testDelegationTokenWithoutRenewerViaRPC() throws Exception { + conf.setBoolean(DFS_NAMENODE_DELEGATION_TOKEN_ALWAYS_USE_KEY, true); + MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).numDataNodes(0) + .build(); + try { + cluster.waitActive(); + DistributedFileSystem fs = cluster.getFileSystem(); + // Should be able to fetch token without renewer. + LocalFileSystem localFileSystem = FileSystem.getLocal(conf); + Path p = new Path(f.getRoot().getAbsolutePath(), tokenFile); + p = localFileSystem.makeQualified(p); + DelegationTokenFetcher.saveDelegationToken(conf, fs, null, p); + Credentials creds = Credentials.readTokenStorageFile(p, conf); + Iterator<Token<?>> itr = creds.getAllTokens().iterator(); + assertTrue("token not exist error", itr.hasNext()); + assertNotNull("Token should be there without renewer", itr.next()); + try { + // Without renewer renewal of token should fail. + DelegationTokenFetcher.renewTokens(conf, p); + fail("Should have failed to renew"); + } catch (AccessControlException e) { + GenericTestUtils.assertExceptionContains( + "tried to renew a token without a renewer", e); + } + } finally { + cluster.shutdown(); + } + } }
