big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "HADOOP-17255. JavaKeyStoreProvider fails to create a new key if the keystore is HDFS. (#2291)"

Browse Source 
This reverts commit 7f5caca04c.
This commit is contained in:
Wei-Chiu Chuang 2020-11-04 16:18:03 -08:00
parent 2cb9e8f66a
commit 7e52c0975f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
View File

@ -23,7 +23,6 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileContext;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@ -105,7 +104,6 @@ public class JavaKeyStoreProvider extends KeyProvider {
private final Path path;
private final FileSystem fs;
private FsPermission permissions;
private FileContext context;
private KeyStore keyStore;
private char[] password;
private boolean changed = false;
@ -133,7 +131,6 @@ private JavaKeyStoreProvider(URI uri, Configuration conf) throws IOException {
this.uri = uri;
path = ProviderUtils.unnestUri(uri);
fs = path.getFileSystem(conf);
context = FileContext.getFileContext(conf);
locateKeystore();
ReadWriteLock lock = new ReentrantReadWriteLock(true);
readLock = lock.readLock();
@ -642,7 +639,10 @@ private void revertFromOld(Path oldPath, boolean fileExisted)
private void renameOrFail(Path src, Path dest)
throws IOException {
context.rename(src, dest, org.apache.hadoop.fs.Options.Rename.NONE);
if (!fs.rename(src, dest)) {
throw new IOException("Rename unsuccessful : "
+ String.format("'%s' to '%s'", src, dest));
}
}
@Override