HDDS-1672. Improve locking in OzoneManager. (apache#1016)

brightace · Jun 28, 2019 · 49c5e8a · 49c5e8a
1 parent f02b0e1
commit 49c5e8a
Show file tree

Hide file tree

Showing 26 changed files with 324 additions and 703 deletions.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
@@ -27,6 +27,7 @@
 import org.apache.hadoop.ozone.om.helpers.OmPrefixInfo;
 import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
 import org.apache.hadoop.ozone.om.helpers.S3SecretValue;
+import org.apache.hadoop.ozone.om.lock.OzoneManagerLock;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.VolumeList;
 import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
 import org.apache.hadoop.utils.db.DBStore;

diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerLock.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerLock.java
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java
@@ -30,6 +30,7 @@
 
 import java.io.IOException;
 
+import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.S3_SECRET_LOCK;
 import static org.apache.hadoop.ozone.security.OzoneSecurityException.ResultCodes.S3_SECRET_NOT_FOUND;
 
 /**
@@ -60,7 +61,7 @@ public S3SecretValue getS3Secret(String kerberosID) throws IOException {
     Preconditions.checkArgument(Strings.isNotBlank(kerberosID),
         "kerberosID cannot be null or empty.");
     S3SecretValue result = null;
-    omMetadataManager.getLock().acquireS3SecretLock(kerberosID);
+    omMetadataManager.getLock().acquireLock(S3_SECRET_LOCK, kerberosID);
     try {
       S3SecretValue s3Secret =
           omMetadataManager.getS3SecretTable().get(kerberosID);
@@ -72,7 +73,7 @@ public S3SecretValue getS3Secret(String kerberosID) throws IOException {
         return s3Secret;
       }
     } finally {
-      omMetadataManager.getLock().releaseS3SecretLock(kerberosID);
+      omMetadataManager.getLock().releaseLock(S3_SECRET_LOCK, kerberosID);
     }
     LOG.trace("Secret for accessKey:{}, proto:{}", kerberosID, result);
     return result;
@@ -86,15 +87,15 @@ public String getS3UserSecretString(String kerberosID)
     LOG.trace("Get secret for awsAccessKey:{}", kerberosID);
 
     S3SecretValue s3Secret;
-    omMetadataManager.getLock().acquireS3SecretLock(kerberosID);
+    omMetadataManager.getLock().acquireLock(S3_SECRET_LOCK, kerberosID);
     try {
       s3Secret = omMetadataManager.getS3SecretTable().get(kerberosID);
       if (s3Secret == null) {
         throw new OzoneSecurityException("S3 secret not found for " +
             "awsAccessKeyId " + kerberosID, S3_SECRET_NOT_FOUND);
       }
     } finally {
-      omMetadataManager.getLock().releaseS3SecretLock(kerberosID);
+      omMetadataManager.getLock().releaseLock(S3_SECRET_LOCK, kerberosID);
     }
 
     return s3Secret.getAwsSecret();