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

HDFS-7931. DistributedFileSystem should not look for keyProvider in cache if Encryption is disabled (asuresh) 

(cherry picked from commit 7660da95cb)
This commit is contained in:
Arun Suresh 2015-04-10 11:40:25 -07:00
parent ad99d268e5
commit 3d17c50176
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -161,6 +161,9 @@ Release 2.7.1 - UNRELEASED
HDFS-8081. Split getAdditionalBlock() into two methods. (shv)
HDFS-7931. DistributedFileSystem should not look for keyProvider in
cache if Encryption is disabled (asuresh)
OPTIMIZATIONS
BUG FIXES

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
View File

@ -3537,6 +3537,10 @@ public void setKeyProvider(KeyProvider provider) {
}
}
public boolean isHDFSEncryptionEnabled() {
return conf.get(
DFSConfigKeys.DFS_ENCRYPTION_KEY_PROVIDER_URI, null) != null;
}
/**
* Returns the SaslDataTransferClient configured for this DFSClient.
*

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
View File

@ -2227,7 +2227,7 @@ public Void next(final FileSystem fs, final Path p)
public Token<?>[] addDelegationTokens(
final String renewer, Credentials credentials) throws IOException {
Token<?>[] tokens = super.addDelegationTokens(renewer, credentials);
if (dfs.getKeyProvider() != null) {
if (dfs.isHDFSEncryptionEnabled()) {
KeyProviderDelegationTokenExtension keyProviderDelegationTokenExtension =
KeyProviderDelegationTokenExtension.
createKeyProviderDelegationTokenExtension(dfs.getKeyProvider());