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 tu...@apache.org on 2014/08/21 20:59:20 UTC
svn commit: r1619531 - in
/hadoop/common/branches/branch-2/hadoop-common-project:
hadoop-common/CHANGES.txt
hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java
Author: tucu
Date: Thu Aug 21 18:59:19 2014
New Revision: 1619531
URL: http://svn.apache.org/r1619531
Log:
HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1619531&r1=1619530&r2=1619531&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 21 18:59:19 2014
@@ -140,6 +140,8 @@ Release 2.6.0 - UNRELEASED
HADOOP-10736. Add key attributes to the key shell. (Mike Yoder via wang)
+ HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh)
+
BUG FIXES
HADOOP-10781. Unportable getgrouplist() usage breaks FreeBSD (Dmitry
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java?rev=1619531&r1=1619530&r2=1619531&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java Thu Aug 21 18:59:19 2014
@@ -28,8 +28,6 @@ import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* Provides access to the <code>AccessControlList</code>s used by KMS,
@@ -52,13 +50,11 @@ public class KMSACLs implements Runnable
public static final int RELOADER_SLEEP_MILLIS = 1000;
- Map<Type, AccessControlList> acls;
- private ReadWriteLock lock;
+ private volatile Map<Type, AccessControlList> acls;
private ScheduledExecutorService executorService;
private long lastReload;
KMSACLs(Configuration conf) {
- lock = new ReentrantReadWriteLock();
if (conf == null) {
conf = loadACLs();
}
@@ -70,17 +66,13 @@ public class KMSACLs implements Runnable
}
private void setACLs(Configuration conf) {
- lock.writeLock().lock();
- try {
- acls = new HashMap<Type, AccessControlList>();
- for (Type aclType : Type.values()) {
- String aclStr = conf.get(aclType.getConfigKey(), ACL_DEFAULT);
- acls.put(aclType, new AccessControlList(aclStr));
- LOG.info("'{}' ACL '{}'", aclType, aclStr);
- }
- } finally {
- lock.writeLock().unlock();
+ Map<Type, AccessControlList> tempAcls = new HashMap<Type, AccessControlList>();
+ for (Type aclType : Type.values()) {
+ String aclStr = conf.get(aclType.getConfigKey(), ACL_DEFAULT);
+ tempAcls.put(aclType, new AccessControlList(aclStr));
+ LOG.info("'{}' ACL '{}'", aclType, aclStr);
}
+ acls = tempAcls;
}
@Override
@@ -120,14 +112,7 @@ public class KMSACLs implements Runnable
public boolean hasAccess(Type type, String user) {
UserGroupInformation ugi = UserGroupInformation.createRemoteUser(user);
- AccessControlList acl = null;
- lock.readLock().lock();
- try {
- acl = acls.get(type);
- } finally {
- lock.readLock().unlock();
- }
- return acl.isUserAllowed(ugi);
+ return acls.get(type).isUserAllowed(ugi);
}
}