Skip to content

HDDS-13723. Add detailed lock information for omMetadataManager locks #9157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivandika3 merged 4 commits into from
Nov 22, 2025
Merged

HDDS-13723. Add detailed lock information for omMetadataManager locks #9157

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6269651
HDDS-13723. Add missing detailed lock information
Oct 14, 2025
c31be3f
Added isLockAcquired check before calling releaseWriteLocks
Nov 14, 2025
3b0ab51
Removed unwanted check
Nov 20, 2025
ab69d32
Fixed checkstyle
Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...rc/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut
return new OMDirectoriesPurgeResponseWithFSO(createErrorOMResponse(omResponse, e));
}
List<String[]> bucketLockKeys = getBucketLockKeySet(purgeDirsRequest);
boolean lockAcquired = omMetadataManager.getLock().acquireWriteLocks(BUCKET_LOCK, bucketLockKeys).isLockAcquired();
mergeOmLockDetails(omMetadataManager.getLock().acquireWriteLocks(BUCKET_LOCK, bucketLockKeys));
boolean lockAcquired = getOmLockDetails().isLockAcquired();
if (!lockAcquired && !purgeDirsRequest.getBucketNameInfosList().isEmpty()) {
OMException oe = new OMException("Unable to acquire write locks on buckets while performing DirectoryPurge",
OMException.ResultCodes.KEY_DELETION_ERROR);
Expand Down Expand Up @@ -254,7 +255,9 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut
volBucketInfoMap.entrySet()) {
entry.setValue(entry.getValue().copyObject());
}
omMetadataManager.getLock().releaseWriteLocks(BUCKET_LOCK, bucketLockKeys);
Comment thread
sumitagrawl marked this conversation as resolved.
if (lockAcquired) {
mergeOmLockDetails(omMetadataManager.getLock().releaseWriteLocks(BUCKET_LOCK, bucketLockKeys));
}
}

return new OMDirectoriesPurgeResponseWithFSO(
Expand Down
4 changes: 3 additions & 1 deletion ...ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ private List<OmBucketInfo> updateBucketSize(List<BucketPurgeKeysSize> bucketPurg
}
return bucketInfoList;
} finally {
mergeOmLockDetails(omMetadataManager.getLock().releaseWriteLocks(BUCKET_LOCK, bucketKeyList));
if (acquiredLock) {
Comment thread
sreejasahithi marked this conversation as resolved.
Outdated
mergeOmLockDetails(omMetadataManager.getLock().releaseWriteLocks(BUCKET_LOCK, bucketKeyList));
}
}
}

Expand Down
8 changes: 3 additions & 5 deletions ...rg/apache/hadoop/ozone/om/request/s3/multipart/S3ExpiredMultipartUploadsAbortRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.apache.hadoop.ozone.om.helpers.OmMultipartAbortInfo;
import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmMultipartUpload;
import org.apache.hadoop.ozone.om.lock.OMLockDetails;
import org.apache.hadoop.ozone.om.request.key.OMKeyRequest;
import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
Expand Down Expand Up @@ -198,11 +197,10 @@ private void updateTableCache(OzoneManager ozoneManager,
OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
OmBucketInfo omBucketInfo = null;
BucketLayout bucketLayout = null;
OMLockDetails omLockDetails = null;
try {
omLockDetails = omMetadataManager.getLock()
.acquireWriteLock(BUCKET_LOCK, volumeName, bucketName);
acquiredLock = omLockDetails.isLockAcquired();
mergeOmLockDetails(omMetadataManager.getLock()
.acquireWriteLock(BUCKET_LOCK, volumeName, bucketName));
acquiredLock = getOmLockDetails().isLockAcquired();

omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName);

Expand Down