You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2014/07/17 19:45:12 UTC
svn commit: r1611415 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt
src/main/java/org/apache/hadoop/security/alias/JavaKeyStoreProvider.java
Author: omalley
Date: Thu Jul 17 17:45:12 2014
New Revision: 1611415
URL: http://svn.apache.org/r1611415
Log:
HADOOP-10732. Fix locking in credential update. (Ted Yu via omalley)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/JavaKeyStoreProvider.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1611415&r1=1611414&r2=1611415&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jul 17 17:45:12 2014
@@ -158,9 +158,6 @@ Trunk (Unreleased)
HADOOP-10485. Remove dead classes in hadoop-streaming. (wheat9)
- HADOOP-10607. Create API to separate credential/password storage from
- applications. (Larry McCay via omalley)
-
HADOOP-10696. Add optional attributes to KeyProvider Options and Metadata.
(tucu)
@@ -418,6 +415,11 @@ Release 2.6.0 - UNRELEASED
HADOOP-10839. Add unregisterSource() to MetricsSystem API.
(Shanyu Zhao via cnauroth)
+ HADOOP-10607. Create an API to separate credentials/password storage
+ from applications (Larry McCay via omalley)
+
+ HADOOP-10732. Fix locking in credential update. (Ted Yu via omalley)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/JavaKeyStoreProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/JavaKeyStoreProvider.java?rev=1611415&r1=1611414&r2=1611415&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/JavaKeyStoreProvider.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/JavaKeyStoreProvider.java Thu Jul 17 17:45:12 2014
@@ -230,6 +230,7 @@ public class JavaKeyStoreProvider extend
CredentialEntry innerSetCredential(String alias, char[] material)
throws IOException {
+ writeLock.lock();
try {
keyStore.setKeyEntry(alias, new SecretKeySpec(
new String(material).getBytes("UTF-8"), "AES"),
@@ -237,6 +238,8 @@ public class JavaKeyStoreProvider extend
} catch (KeyStoreException e) {
throw new IOException("Can't store credential " + alias + " in " + this,
e);
+ } finally {
+ writeLock.unlock();
}
changed = true;
return new CredentialEntry(alias, material);