Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-15585: ViewDFS#getDelegationToken should not throw UnsupportedOperationException. (#2312). Contributed by Uma Maheswara Rao G.

This commit is contained in:
Uma Maheswara Rao G 2020-09-18 02:48:10 -07:00 committed by GitHub
parent eacbe07b56
commit 7bba4c609c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ViewDistributedFileSystem.java
View File

@ -1032,15 +1032,24 @@ public class ViewDistributedFileSystem extends DistributedFileSystem {
return super.getDefaultPort(); return super.getDefaultPort();
} }
/**
* If no mount points configured, it works same as
* {@link DistributedFileSystem#getDelegationToken(String)}. If
* there are mount points configured and if default fs(linkFallback)
* configured, then it will return default fs delegation token. Otherwise
* it will return null.
*/
@Override @Override
public Token<DelegationTokenIdentifier> getDelegationToken(String renewer) public Token<DelegationTokenIdentifier> getDelegationToken(String renewer)
throws IOException { throws IOException {
if (this.vfs == null) { if (this.vfs == null) {
return super.getDelegationToken(renewer); return super.getDelegationToken(renewer);
} }
//Let applications call getDelegationTokenIssuers and get respective
// delegation tokens from child fs. if (defaultDFS != null) {
throw new UnsupportedOperationException(); return defaultDFS.getDelegationToken(renewer);
}
return null;
} }
@Override @Override

22
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestViewDistributedFileSystem.java
View File

@ -18,14 +18,17 @@
package org.apache.hadoop.hdfs; package org.apache.hadoop.hdfs;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathHandle; import org.apache.hadoop.fs.PathHandle;
import org.apache.hadoop.fs.viewfs.ConfigUtil;
import org.apache.hadoop.hdfs.protocol.HdfsConstants; import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.test.Whitebox; import org.apache.hadoop.test.Whitebox;
import org.junit.Test; import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
public class TestViewDistributedFileSystem extends TestDistributedFileSystem{ public class TestViewDistributedFileSystem extends TestDistributedFileSystem{
@Override @Override
@ -67,4 +70,23 @@ public class TestViewDistributedFileSystem extends TestDistributedFileSystem{
} }
} }
} }
@Override
public void testEmptyDelegationToken() throws IOException {
Configuration conf = getTestConfiguration();
MiniDFSCluster cluster = null;
try {
cluster = new MiniDFSCluster.Builder(conf).numDataNodes(0).build();
URI defaultUri =
URI.create(conf.get(CommonConfigurationKeys.FS_DEFAULT_NAME_KEY));
ConfigUtil.addLinkFallback(conf, defaultUri.getHost(), defaultUri);
try (FileSystem fileSys = FileSystem.get(conf)) {
fileSys.getDelegationToken("");
}
} finally {
if (cluster != null) {
cluster.shutdown();
}
}
}
} }