HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b6ceef90 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b6ceef90 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b6ceef90 Branch: refs/heads/HDFS-6581 Commit: b6ceef90e52c05fd95bfb40bff61fa7e1802787f Parents: 9e35571 Author: Andrew Wang <w...@apache.org> Authored: Fri Sep 19 17:42:00 2014 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Fri Sep 19 17:42:00 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../org/apache/hadoop/crypto/key/kms/server/TestKMSWithZK.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b6ceef90/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0603304..70579c3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -591,6 +591,8 @@ Release 2.6.0 - UNRELEASED HADOOP-10833. Remove unused cache in UserProvider. (Benoy Antony) + HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang) + BUG FIXES HADOOP-10781. Unportable getgrouplist() usage breaks FreeBSD (Dmitry http://git-wip-us.apache.org/repos/asf/hadoop/blob/b6ceef90/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSWithZK.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSWithZK.java b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSWithZK.java index 59b0002..3a02a0a 100644 --- a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSWithZK.java +++ b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSWithZK.java @@ -76,7 +76,7 @@ public class TestKMSWithZK { protected Configuration createBaseKMSConf(File keyStoreDir) throws Exception { Configuration conf = new Configuration(false); - conf.set("hadoop.security.key.provider.path", + conf.set(KMSConfiguration.KEY_PROVIDER_URI, "jceks://file@" + new Path(keyStoreDir.getAbsolutePath(), "kms.keystore").toUri()); conf.set("hadoop.kms.authentication.type", "simple");
