From eec927f3fcce172aee82a6c51f358fec86e6ba47 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Fri, 19 Sep 2014 17:42:00 -0700 Subject: [PATCH] HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang) (cherry picked from commit b6ceef90e52c05fd95bfb40bff61fa7e1802787f) --- 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(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index fe60e6e4258..ed3e0509271 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -255,6 +255,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 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 59b00023f40..3a02a0a2810 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");