This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7e52c09 Revert "HADOOP-17255. JavaKeyStoreProvider fails to create a
new key if the keystore is HDFS. (#2291)"
7e52c09 is described below
commit 7e52c0975f79b7b5739e91b224ced14c8dc76cf6
Author: Wei-Chiu Chuang <[email protected]>
AuthorDate: Wed Nov 4 16:18:03 2020 -0800
Revert "HADOOP-17255. JavaKeyStoreProvider fails to create a new key if the
keystore is HDFS. (#2291)"
This reverts commit 7f5caca04cb8e5dab8410ef64daa0fe799e389fd.
---
.../java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
index ede614d..3c3099e 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
@@ -23,7 +23,6 @@ import org.apache.hadoop.classification.InterfaceAudience;
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 @@ public class JavaKeyStoreProvider extends KeyProvider {
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 @@ public class JavaKeyStoreProvider extends KeyProvider {
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
