You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by xy...@apache.org on 2020/10/30 17:05:39 UTC
[ozone] branch master updated: HDDS-4345. Replace the deprecated
Lock method (#1497)
This is an automated email from the ASF dual-hosted git repository.
xyao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new d8f4dc1 HDDS-4345. Replace the deprecated Lock method (#1497)
d8f4dc1 is described below
commit d8f4dc145318288cb978ee30f3e66c9e0689ed9d
Author: micah zhao <mi...@tencent.com>
AuthorDate: Sat Oct 31 01:05:30 2020 +0800
HDDS-4345. Replace the deprecated Lock method (#1497)
---
.../hadoop/ozone/om/lock/TestOzoneManagerLock.java | 52 +++++++++---------
.../apache/hadoop/ozone/om/BucketManagerImpl.java | 32 ++++++------
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 61 +++++++++++++---------
.../apache/hadoop/ozone/om/PrefixManagerImpl.java | 24 ++++-----
.../hadoop/ozone/om/S3SecretManagerImpl.java | 8 +--
.../apache/hadoop/ozone/om/VolumeManagerImpl.java | 36 ++++++-------
.../ozone/om/request/key/OMKeyCommitRequest.java | 4 +-
7 files changed, 114 insertions(+), 103 deletions(-)
diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
index 8438cbf..7e21355 100644
--- a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
+++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneManagerLock.java
@@ -50,8 +50,8 @@ public class TestOzoneManagerLock {
private void testResourceLock(String[] resourceName,
OzoneManagerLock.Resource resource) {
OzoneManagerLock lock = new OzoneManagerLock(new OzoneConfiguration());
- lock.acquireLock(resource, resourceName);
- lock.releaseLock(resource, resourceName);
+ lock.acquireWriteLock(resource, resourceName);
+ lock.releaseWriteLock(resource, resourceName);
Assert.assertTrue(true);
}
@@ -73,22 +73,22 @@ public class TestOzoneManagerLock {
if (resource == OzoneManagerLock.Resource.USER_LOCK ||
resource == OzoneManagerLock.Resource.S3_SECRET_LOCK ||
resource == OzoneManagerLock.Resource.PREFIX_LOCK){
- lock.acquireLock(resource, resourceName);
+ lock.acquireWriteLock(resource, resourceName);
try {
- lock.acquireLock(resource, resourceName);
+ lock.acquireWriteLock(resource, resourceName);
fail("reacquireResourceLock failed");
} catch (RuntimeException ex) {
String message = "cannot acquire " + resource.getName() + " lock " +
"while holding [" + resource.getName() + "] lock(s).";
Assert.assertTrue(ex.getMessage(), ex.getMessage().contains(message));
}
- lock.releaseLock(resource, resourceName);
+ lock.releaseWriteLock(resource, resourceName);
Assert.assertTrue(true);
} else {
- lock.acquireLock(resource, resourceName);
- lock.acquireLock(resource, resourceName);
- lock.releaseLock(resource, resourceName);
- lock.releaseLock(resource, resourceName);
+ lock.acquireWriteLock(resource, resourceName);
+ lock.acquireWriteLock(resource, resourceName);
+ lock.releaseWriteLock(resource, resourceName);
+ lock.releaseWriteLock(resource, resourceName);
Assert.assertTrue(true);
}
}
@@ -105,20 +105,20 @@ public class TestOzoneManagerLock {
OzoneManagerLock.Resource.values()) {
Stack<ResourceInfo> stack = new Stack<>();
resourceName = generateResourceName(resource);
- lock.acquireLock(resource, resourceName);
+ lock.acquireWriteLock(resource, resourceName);
stack.push(new ResourceInfo(resourceName, resource));
for (OzoneManagerLock.Resource higherResource :
OzoneManagerLock.Resource.values()) {
if (higherResource.getMask() > resource.getMask()) {
resourceName = generateResourceName(higherResource);
- lock.acquireLock(higherResource, resourceName);
+ lock.acquireWriteLock(higherResource, resourceName);
stack.push(new ResourceInfo(resourceName, higherResource));
}
}
// Now release locks
while (!stack.empty()) {
ResourceInfo resourceInfo = stack.pop();
- lock.releaseLock(resourceInfo.getResource(),
+ lock.releaseWriteLock(resourceInfo.getResource(),
resourceInfo.getLockName());
}
}
@@ -134,9 +134,9 @@ public class TestOzoneManagerLock {
OzoneManagerLock.Resource.values()) {
if (higherResource.getMask() > resource.getMask()) {
String[] resourceName = generateResourceName(higherResource);
- lock.acquireLock(higherResource, resourceName);
+ lock.acquireWriteLock(higherResource, resourceName);
try {
- lock.acquireLock(resource, generateResourceName(resource));
+ lock.acquireWriteLock(resource, generateResourceName(resource));
fail("testLockViolationsWithOneHigherLevelLock failed");
} catch (RuntimeException ex) {
String message = "cannot acquire " + resource.getName() + " lock " +
@@ -144,7 +144,7 @@ public class TestOzoneManagerLock {
Assert.assertTrue(ex.getMessage(),
ex.getMessage().contains(message));
}
- lock.releaseLock(higherResource, resourceName);
+ lock.releaseWriteLock(higherResource, resourceName);
}
}
}
@@ -167,14 +167,14 @@ public class TestOzoneManagerLock {
OzoneManagerLock.Resource.values()) {
if (higherResource.getMask() > resource.getMask()) {
resourceName = generateResourceName(higherResource);
- lock.acquireLock(higherResource, resourceName);
+ lock.acquireWriteLock(higherResource, resourceName);
stack.push(new ResourceInfo(resourceName, higherResource));
currentLocks.add(higherResource.getName());
queue.add(new ResourceInfo(resourceName, higherResource));
// try to acquire lower level lock
try {
resourceName = generateResourceName(resource);
- lock.acquireLock(resource, resourceName);
+ lock.acquireWriteLock(resource, resourceName);
} catch (RuntimeException ex) {
String message = "cannot acquire " + resource.getName() + " lock " +
"while holding " + currentLocks.toString() + " lock(s).";
@@ -187,7 +187,7 @@ public class TestOzoneManagerLock {
// Now release locks
while (!stack.empty()) {
ResourceInfo resourceInfo = stack.pop();
- lock.releaseLock(resourceInfo.getResource(),
+ lock.releaseWriteLock(resourceInfo.getResource(),
resourceInfo.getLockName());
}
}
@@ -198,7 +198,7 @@ public class TestOzoneManagerLock {
OzoneManagerLock lock =
new OzoneManagerLock(new OzoneConfiguration());
try {
- lock.releaseLock(OzoneManagerLock.Resource.USER_LOCK, "user3");
+ lock.releaseWriteLock(OzoneManagerLock.Resource.USER_LOCK, "user3");
fail("releaseLockWithOutAcquiringLock failed");
} catch (IllegalMonitorStateException ex) {
String message = "Releasing lock on resource $user3 without acquiring " +
@@ -265,7 +265,7 @@ public class TestOzoneManagerLock {
@Test
public void acquireMultiUserLockAfterUserLock() {
OzoneManagerLock lock = new OzoneManagerLock(new OzoneConfiguration());
- lock.acquireLock(OzoneManagerLock.Resource.USER_LOCK, "user3");
+ lock.acquireWriteLock(OzoneManagerLock.Resource.USER_LOCK, "user3");
try {
lock.acquireMultiUserLock("user1", "user2");
fail("acquireMultiUserLockAfterUserLock failed");
@@ -274,7 +274,7 @@ public class TestOzoneManagerLock {
"[USER_LOCK] lock(s).";
Assert.assertTrue(ex.getMessage(), ex.getMessage().contains(message));
}
- lock.releaseLock(OzoneManagerLock.Resource.USER_LOCK, "user3");
+ lock.releaseWriteLock(OzoneManagerLock.Resource.USER_LOCK, "user3");
}
@Test
@@ -282,7 +282,7 @@ public class TestOzoneManagerLock {
OzoneManagerLock lock = new OzoneManagerLock(new OzoneConfiguration());
lock.acquireMultiUserLock("user1", "user2");
try {
- lock.acquireLock(OzoneManagerLock.Resource.USER_LOCK, "user3");
+ lock.acquireWriteLock(OzoneManagerLock.Resource.USER_LOCK, "user3");
fail("acquireUserLockAfterMultiUserLock failed");
} catch (RuntimeException ex) {
String message = "cannot acquire USER_LOCK lock while holding " +
@@ -299,20 +299,20 @@ public class TestOzoneManagerLock {
for (OzoneManagerLock.Resource resource :
OzoneManagerLock.Resource.values()) {
final String[] resourceName = generateResourceName(resource);
- lock.acquireLock(resource, resourceName);
+ lock.acquireWriteLock(resource, resourceName);
AtomicBoolean gotLock = new AtomicBoolean(false);
new Thread(() -> {
- lock.acquireLock(resource, resourceName);
+ lock.acquireWriteLock(resource, resourceName);
gotLock.set(true);
- lock.releaseLock(resource, resourceName);
+ lock.releaseWriteLock(resource, resourceName);
}).start();
// Let's give some time for the new thread to run
Thread.sleep(100);
// Since the new thread is trying to get lock on same resource,
// it will wait.
Assert.assertFalse(gotLock.get());
- lock.releaseLock(resource, resourceName);
+ lock.releaseWriteLock(resource, resourceName);
// Since we have released the lock, the new thread should have the lock
// now.
// Let's give some time for the new thread to run
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
index 68466f4..a93ebe6 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
@@ -117,10 +117,10 @@ public class BucketManagerImpl implements BucketManager {
String volumeName = bucketInfo.getVolumeName();
String bucketName = bucketInfo.getBucketName();
boolean acquiredBucketLock = false;
- metadataManager.getLock().acquireLock(VOLUME_LOCK, volumeName);
+ metadataManager.getLock().acquireWriteLock(VOLUME_LOCK, volumeName);
try {
- acquiredBucketLock = metadataManager.getLock().acquireLock(BUCKET_LOCK,
- volumeName, bucketName);
+ acquiredBucketLock = metadataManager.getLock().acquireWriteLock(
+ BUCKET_LOCK, volumeName, bucketName);
String volumeKey = metadataManager.getVolumeKey(volumeName);
String bucketKey = metadataManager.getBucketKey(volumeName, bucketName);
OmVolumeArgs volumeArgs = metadataManager.getVolumeTable().get(volumeKey);
@@ -188,10 +188,10 @@ public class BucketManagerImpl implements BucketManager {
throw ex;
} finally {
if (acquiredBucketLock) {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
- metadataManager.getLock().releaseLock(VOLUME_LOCK, volumeName);
+ metadataManager.getLock().releaseWriteLock(VOLUME_LOCK, volumeName);
}
}
@@ -282,7 +282,8 @@ public class BucketManagerImpl implements BucketManager {
Preconditions.checkNotNull(args);
String volumeName = args.getVolumeName();
String bucketName = args.getBucketName();
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
try {
String bucketKey = metadataManager.getBucketKey(volumeName, bucketName);
OmBucketInfo oldBucketInfo =
@@ -336,7 +337,7 @@ public class BucketManagerImpl implements BucketManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
}
@@ -353,7 +354,8 @@ public class BucketManagerImpl implements BucketManager {
throws IOException {
Preconditions.checkNotNull(volumeName);
Preconditions.checkNotNull(bucketName);
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
try {
//Check if bucket exists
String bucketKey = metadataManager.getBucketKey(volumeName, bucketName);
@@ -376,7 +378,7 @@ public class BucketManagerImpl implements BucketManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
}
@@ -418,7 +420,7 @@ public class BucketManagerImpl implements BucketManager {
String volume = obj.getVolumeName();
String bucket = obj.getBucketName();
boolean changed = false;
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volume, bucket);
try {
String dbBucketKey = metadataManager.getBucketKey(volume, bucket);
OmBucketInfo bucketInfo =
@@ -440,7 +442,7 @@ public class BucketManagerImpl implements BucketManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volume, bucket);
}
return changed;
@@ -465,7 +467,7 @@ public class BucketManagerImpl implements BucketManager {
String volume = obj.getVolumeName();
String bucket = obj.getBucketName();
boolean removed = false;
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volume, bucket);
try {
String dbBucketKey = metadataManager.getBucketKey(volume, bucket);
OmBucketInfo bucketInfo =
@@ -486,7 +488,7 @@ public class BucketManagerImpl implements BucketManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volume, bucket);
}
return removed;
}
@@ -509,7 +511,7 @@ public class BucketManagerImpl implements BucketManager {
}
String volume = obj.getVolumeName();
String bucket = obj.getBucketName();
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volume, bucket);
try {
String dbBucketKey = metadataManager.getBucketKey(volume, bucket);
OmBucketInfo bucketInfo =
@@ -528,7 +530,7 @@ public class BucketManagerImpl implements BucketManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volume, bucket);
}
return true;
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index 45ad0b3..83fa020 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -459,7 +459,8 @@ public class KeyManagerImpl implements KeyManager {
args.getVolumeName(), args.getBucketName(), args.getKeyName());
FileEncryptionInfo encInfo;
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
OmBucketInfo bucketInfo;
try {
bucketInfo = getBucketInfo(volumeName, bucketName);
@@ -472,7 +473,7 @@ public class KeyManagerImpl implements KeyManager {
volumeName, bucketName, keyName, ex);
throw new OMException(ex.getMessage(), ResultCodes.KEY_ALLOCATION_ERROR);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
if (keyInfo == null) {
@@ -613,7 +614,7 @@ public class KeyManagerImpl implements KeyManager {
.getOpenKey(volumeName, bucketName, keyName, clientID);
Preconditions.checkNotNull(locationInfoList);
try {
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
bucketName);
validateBucket(volumeName, bucketName);
OmKeyInfo keyInfo = metadataManager.getOpenKeyTable().get(openKey);
@@ -640,7 +641,7 @@ public class KeyManagerImpl implements KeyManager {
throw new OMException(ex.getMessage(),
ResultCodes.KEY_ALLOCATION_ERROR);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
}
@@ -798,7 +799,8 @@ public class KeyManagerImpl implements KeyManager {
ResultCodes.INVALID_KEY_NAME);
}
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
try {
// fromKeyName should exist
String fromKey = metadataManager.getOzoneKey(
@@ -851,7 +853,7 @@ public class KeyManagerImpl implements KeyManager {
throw new OMException(ex.getMessage(),
ResultCodes.KEY_RENAME_ERROR);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
}
@@ -862,7 +864,8 @@ public class KeyManagerImpl implements KeyManager {
String volumeName = args.getVolumeName();
String bucketName = args.getBucketName();
String keyName = args.getKeyName();
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
try {
String objectKey = metadataManager.getOzoneKey(
volumeName, bucketName, keyName);
@@ -893,7 +896,7 @@ public class KeyManagerImpl implements KeyManager {
throw new OMException(ex.getMessage(), ex,
ResultCodes.KEY_DELETION_ERROR);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
}
@@ -987,7 +990,8 @@ public class KeyManagerImpl implements KeyManager {
String bucketName = keyArgs.getBucketName();
String keyName = keyArgs.getKeyName();
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
OmBucketInfo bucketInfo = validateS3Bucket(volumeName, bucketName);
try {
@@ -1050,7 +1054,7 @@ public class KeyManagerImpl implements KeyManager {
throw new OMException(ex.getMessage(),
ResultCodes.INITIATE_MULTIPART_UPLOAD_ERROR);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
}
@@ -1104,7 +1108,8 @@ public class KeyManagerImpl implements KeyManager {
String uploadID = omKeyArgs.getMultipartUploadID();
int partNumber = omKeyArgs.getMultipartUploadPartNumber();
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
validateS3Bucket(volumeName, bucketName);
String partName;
try {
@@ -1191,7 +1196,7 @@ public class KeyManagerImpl implements KeyManager {
throw new OMException(ex.getMessage(),
ResultCodes.MULTIPART_UPLOAD_PARTFILE_ERROR);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
@@ -1210,7 +1215,8 @@ public class KeyManagerImpl implements KeyManager {
String bucketName = omKeyArgs.getBucketName();
String keyName = omKeyArgs.getKeyName();
String uploadID = omKeyArgs.getMultipartUploadID();
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
validateS3Bucket(volumeName, bucketName);
try {
String multipartKey = metadataManager.getMultipartKey(volumeName,
@@ -1238,7 +1244,7 @@ public class KeyManagerImpl implements KeyManager {
throw new OMException(ex.getMessage(), ResultCodes
.COMPLETE_MULTIPART_UPLOAD_ERROR);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
}
@@ -1253,7 +1259,8 @@ public class KeyManagerImpl implements KeyManager {
String uploadID = omKeyArgs.getMultipartUploadID();
Preconditions.checkNotNull(uploadID, "uploadID cannot be null");
validateS3Bucket(volumeName, bucketName);
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
OmBucketInfo bucketInfo;
try {
String multipartKey = metadataManager.getMultipartKey(volumeName,
@@ -1311,7 +1318,7 @@ public class KeyManagerImpl implements KeyManager {
throw new OMException(ex.getMessage(), ResultCodes
.ABORT_MULTIPART_UPLOAD_FAILED);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
@@ -1490,7 +1497,7 @@ public class KeyManagerImpl implements KeyManager {
boolean changed = false;
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volume, bucket);
try {
validateBucket(volume, bucket);
String objectKey = metadataManager.getOzoneKey(volume, bucket, keyName);
@@ -1513,7 +1520,7 @@ public class KeyManagerImpl implements KeyManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volume, bucket);
}
return changed;
}
@@ -1534,7 +1541,7 @@ public class KeyManagerImpl implements KeyManager {
String keyName = obj.getKeyName();
boolean changed = false;
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volume, bucket);
try {
validateBucket(volume, bucket);
String objectKey = metadataManager.getOzoneKey(volume, bucket, keyName);
@@ -1554,7 +1561,7 @@ public class KeyManagerImpl implements KeyManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volume, bucket);
}
return changed;
}
@@ -1575,7 +1582,7 @@ public class KeyManagerImpl implements KeyManager {
String keyName = obj.getKeyName();
boolean changed = false;
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volume, bucket);
try {
validateBucket(volume, bucket);
String objectKey = metadataManager.getOzoneKey(volume, bucket, keyName);
@@ -1596,7 +1603,7 @@ public class KeyManagerImpl implements KeyManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volume, bucket);
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volume, bucket);
}
return changed;
}
@@ -1853,7 +1860,8 @@ public class KeyManagerImpl implements KeyManager {
String bucketName = args.getBucketName();
String keyName = args.getKeyName();
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
try {
// Check if this is the root of the filesystem.
@@ -1875,7 +1883,7 @@ public class KeyManagerImpl implements KeyManager {
.getOzoneKey(volumeName, bucketName, dirDbKeyInfo.getKeyName());
metadataManager.getKeyTable().put(dirDbKey, dirDbKeyInfo);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
}
@@ -1927,7 +1935,8 @@ public class KeyManagerImpl implements KeyManager {
String keyName = args.getKeyName();
OpenKeySession keySession;
- metadataManager.getLock().acquireLock(BUCKET_LOCK, volumeName, bucketName);
+ metadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName,
+ bucketName);
try {
OzoneFileStatus fileStatus;
try {
@@ -1953,7 +1962,7 @@ public class KeyManagerImpl implements KeyManager {
// filestatus. We can avoid some operations in openKey call.
keySession = openKey(args);
} finally {
- metadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ metadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/PrefixManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/PrefixManagerImpl.java
index 6461a7e..7669233 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/PrefixManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/PrefixManagerImpl.java
@@ -101,7 +101,7 @@ public class PrefixManagerImpl implements PrefixManager {
validateOzoneObj(obj);
String prefixPath = obj.getPath();
- metadataManager.getLock().acquireLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().acquireWriteLock(PREFIX_LOCK, prefixPath);
try {
OmPrefixInfo prefixInfo =
metadataManager.getPrefixTable().get(prefixPath);
@@ -117,7 +117,7 @@ public class PrefixManagerImpl implements PrefixManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().releaseWriteLock(PREFIX_LOCK, prefixPath);
}
}
@@ -133,7 +133,7 @@ public class PrefixManagerImpl implements PrefixManager {
public boolean removeAcl(OzoneObj obj, OzoneAcl acl) throws IOException {
validateOzoneObj(obj);
String prefixPath = obj.getPath();
- metadataManager.getLock().acquireLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().acquireWriteLock(PREFIX_LOCK, prefixPath);
try {
OmPrefixInfo prefixInfo =
metadataManager.getPrefixTable().get(prefixPath);
@@ -156,7 +156,7 @@ public class PrefixManagerImpl implements PrefixManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().releaseWriteLock(PREFIX_LOCK, prefixPath);
}
}
@@ -172,7 +172,7 @@ public class PrefixManagerImpl implements PrefixManager {
public boolean setAcl(OzoneObj obj, List<OzoneAcl> acls) throws IOException {
validateOzoneObj(obj);
String prefixPath = obj.getPath();
- metadataManager.getLock().acquireLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().acquireWriteLock(PREFIX_LOCK, prefixPath);
try {
OmPrefixInfo prefixInfo =
metadataManager.getPrefixTable().get(prefixPath);
@@ -188,7 +188,7 @@ public class PrefixManagerImpl implements PrefixManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().releaseWriteLock(PREFIX_LOCK, prefixPath);
}
}
@@ -202,7 +202,7 @@ public class PrefixManagerImpl implements PrefixManager {
public List<OzoneAcl> getAcl(OzoneObj obj) throws IOException {
validateOzoneObj(obj);
String prefixPath = obj.getPath();
- metadataManager.getLock().acquireLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().acquireReadLock(PREFIX_LOCK, prefixPath);
try {
String longestPrefix = prefixTree.getLongestPrefix(prefixPath);
if (prefixPath.equals(longestPrefix)) {
@@ -213,7 +213,7 @@ public class PrefixManagerImpl implements PrefixManager {
}
}
} finally {
- metadataManager.getLock().releaseLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().releaseReadLock(PREFIX_LOCK, prefixPath);
}
return EMPTY_ACL_LIST;
}
@@ -232,7 +232,7 @@ public class PrefixManagerImpl implements PrefixManager {
Objects.requireNonNull(context);
String prefixPath = ozObject.getPath();
- metadataManager.getLock().acquireLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().acquireReadLock(PREFIX_LOCK, prefixPath);
try {
String longestPrefix = prefixTree.getLongestPrefix(prefixPath);
if (prefixPath.equals(longestPrefix)) {
@@ -253,18 +253,18 @@ public class PrefixManagerImpl implements PrefixManager {
return true;
}
} finally {
- metadataManager.getLock().releaseLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().releaseReadLock(PREFIX_LOCK, prefixPath);
}
}
@Override
public List<OmPrefixInfo> getLongestPrefixPath(String path) {
String prefixPath = prefixTree.getLongestPrefix(path);
- metadataManager.getLock().acquireLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().acquireReadLock(PREFIX_LOCK, prefixPath);
try {
return getLongestPrefixPathHelper(prefixPath);
} finally {
- metadataManager.getLock().releaseLock(PREFIX_LOCK, prefixPath);
+ metadataManager.getLock().releaseReadLock(PREFIX_LOCK, prefixPath);
}
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java
index fb56658..59fa467 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java
@@ -61,7 +61,7 @@ public class S3SecretManagerImpl implements S3SecretManager {
Preconditions.checkArgument(Strings.isNotBlank(kerberosID),
"kerberosID cannot be null or empty.");
S3SecretValue result = null;
- omMetadataManager.getLock().acquireLock(S3_SECRET_LOCK, kerberosID);
+ omMetadataManager.getLock().acquireWriteLock(S3_SECRET_LOCK, kerberosID);
try {
S3SecretValue s3Secret =
omMetadataManager.getS3SecretTable().get(kerberosID);
@@ -73,7 +73,7 @@ public class S3SecretManagerImpl implements S3SecretManager {
return s3Secret;
}
} finally {
- omMetadataManager.getLock().releaseLock(S3_SECRET_LOCK, kerberosID);
+ omMetadataManager.getLock().releaseWriteLock(S3_SECRET_LOCK, kerberosID);
}
if (LOG.isTraceEnabled()) {
LOG.trace("Secret for accessKey:{}, proto:{}", kerberosID, result);
@@ -89,7 +89,7 @@ public class S3SecretManagerImpl implements S3SecretManager {
LOG.trace("Get secret for awsAccessKey:{}", kerberosID);
S3SecretValue s3Secret;
- omMetadataManager.getLock().acquireLock(S3_SECRET_LOCK, kerberosID);
+ omMetadataManager.getLock().acquireReadLock(S3_SECRET_LOCK, kerberosID);
try {
s3Secret = omMetadataManager.getS3SecretTable().get(kerberosID);
if (s3Secret == null) {
@@ -97,7 +97,7 @@ public class S3SecretManagerImpl implements S3SecretManager {
"awsAccessKeyId " + kerberosID, S3_SECRET_NOT_FOUND);
}
} finally {
- omMetadataManager.getLock().releaseLock(S3_SECRET_LOCK, kerberosID);
+ omMetadataManager.getLock().releaseReadLock(S3_SECRET_LOCK, kerberosID);
}
return s3Secret.getAwsSecret();
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/VolumeManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/VolumeManagerImpl.java
index b3e8186..19b2945 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/VolumeManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/VolumeManagerImpl.java
@@ -124,10 +124,10 @@ public class VolumeManagerImpl implements VolumeManager {
Preconditions.checkNotNull(omVolumeArgs);
boolean acquiredUserLock = false;
- metadataManager.getLock().acquireLock(VOLUME_LOCK,
+ metadataManager.getLock().acquireWriteLock(VOLUME_LOCK,
omVolumeArgs.getVolume());
try {
- acquiredUserLock = metadataManager.getLock().acquireLock(USER_LOCK,
+ acquiredUserLock = metadataManager.getLock().acquireWriteLock(USER_LOCK,
omVolumeArgs.getOwnerName());
String dbVolumeKey = metadataManager.getVolumeKey(
omVolumeArgs.getVolume());
@@ -162,10 +162,10 @@ public class VolumeManagerImpl implements VolumeManager {
throw ex;
} finally {
if (acquiredUserLock) {
- metadataManager.getLock().releaseLock(USER_LOCK,
+ metadataManager.getLock().releaseWriteLock(USER_LOCK,
omVolumeArgs.getOwnerName());
}
- metadataManager.getLock().releaseLock(VOLUME_LOCK,
+ metadataManager.getLock().releaseWriteLock(VOLUME_LOCK,
omVolumeArgs.getVolume());
}
}
@@ -201,7 +201,7 @@ public class VolumeManagerImpl implements VolumeManager {
Preconditions.checkNotNull(owner);
boolean acquiredUsersLock = false;
String actualOwner = null;
- metadataManager.getLock().acquireLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().acquireWriteLock(VOLUME_LOCK, volume);
try {
String dbVolumeKey = metadataManager.getVolumeKey(volume);
OmVolumeArgs volumeArgs = metadataManager
@@ -240,7 +240,7 @@ public class VolumeManagerImpl implements VolumeManager {
if (acquiredUsersLock) {
metadataManager.getLock().releaseMultiUserLock(owner, actualOwner);
}
- metadataManager.getLock().releaseLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().releaseWriteLock(VOLUME_LOCK, volume);
}
}
@@ -309,10 +309,10 @@ public class VolumeManagerImpl implements VolumeManager {
Preconditions.checkNotNull(volume);
String owner = null;
boolean acquiredUserLock = false;
- metadataManager.getLock().acquireLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().acquireWriteLock(VOLUME_LOCK, volume);
try {
owner = getVolumeInfo(volume).getOwnerName();
- acquiredUserLock = metadataManager.getLock().acquireLock(USER_LOCK,
+ acquiredUserLock = metadataManager.getLock().acquireWriteLock(USER_LOCK,
owner);
String dbVolumeKey = metadataManager.getVolumeKey(volume);
OmVolumeArgs volumeArgs =
@@ -342,9 +342,9 @@ public class VolumeManagerImpl implements VolumeManager {
throw ex;
} finally {
if (acquiredUserLock) {
- metadataManager.getLock().releaseLock(USER_LOCK, owner);
+ metadataManager.getLock().releaseWriteLock(USER_LOCK, owner);
}
- metadataManager.getLock().releaseLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().releaseWriteLock(VOLUME_LOCK, volume);
}
}
@@ -435,7 +435,7 @@ public class VolumeManagerImpl implements VolumeManager {
"VolumeManager. OzoneObj type:" + obj.getResourceType());
}
String volume = obj.getVolumeName();
- metadataManager.getLock().acquireLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().acquireWriteLock(VOLUME_LOCK, volume);
try {
String dbVolumeKey = metadataManager.getVolumeKey(volume);
OmVolumeArgs volumeArgs =
@@ -464,7 +464,7 @@ public class VolumeManagerImpl implements VolumeManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().releaseWriteLock(VOLUME_LOCK, volume);
}
return true;
@@ -487,7 +487,7 @@ public class VolumeManagerImpl implements VolumeManager {
"VolumeManager. OzoneObj type:" + obj.getResourceType());
}
String volume = obj.getVolumeName();
- metadataManager.getLock().acquireLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().acquireWriteLock(VOLUME_LOCK, volume);
try {
String dbVolumeKey = metadataManager.getVolumeKey(volume);
OmVolumeArgs volumeArgs =
@@ -516,7 +516,7 @@ public class VolumeManagerImpl implements VolumeManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().releaseWriteLock(VOLUME_LOCK, volume);
}
return true;
@@ -540,7 +540,7 @@ public class VolumeManagerImpl implements VolumeManager {
"VolumeManager. OzoneObj type:" + obj.getResourceType());
}
String volume = obj.getVolumeName();
- metadataManager.getLock().acquireLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().acquireWriteLock(VOLUME_LOCK, volume);
try {
String dbVolumeKey = metadataManager.getVolumeKey(volume);
OmVolumeArgs volumeArgs =
@@ -562,7 +562,7 @@ public class VolumeManagerImpl implements VolumeManager {
}
throw ex;
} finally {
- metadataManager.getLock().releaseLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().releaseWriteLock(VOLUME_LOCK, volume);
}
return true;
@@ -620,7 +620,7 @@ public class VolumeManagerImpl implements VolumeManager {
Objects.requireNonNull(context);
String volume = ozObject.getVolumeName();
- metadataManager.getLock().acquireLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().acquireReadLock(VOLUME_LOCK, volume);
try {
String dbVolumeKey = metadataManager.getVolumeKey(volume);
OmVolumeArgs volumeArgs =
@@ -647,7 +647,7 @@ public class VolumeManagerImpl implements VolumeManager {
throw new OMException("Check access operation failed for " +
"volume:" + volume, ex, ResultCodes.INTERNAL_ERROR);
} finally {
- metadataManager.getLock().releaseLock(VOLUME_LOCK, volume);
+ metadataManager.getLock().releaseReadLock(VOLUME_LOCK, volume);
}
}
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
index 29d0243..b1d47de 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
@@ -153,7 +153,7 @@ public class OMKeyCommitRequest extends OMKeyRequest {
}
bucketLockAcquired =
- omMetadataManager.getLock().acquireLock(BUCKET_LOCK,
+ omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK,
volumeName, bucketName);
validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
@@ -220,7 +220,7 @@ public class OMKeyCommitRequest extends OMKeyRequest {
omDoubleBufferHelper);
if(bucketLockAcquired) {
- omMetadataManager.getLock().releaseLock(BUCKET_LOCK, volumeName,
+ omMetadataManager.getLock().releaseWriteLock(BUCKET_LOCK, volumeName,
bucketName);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org