Skip to content

HDDS-14841. Run createFakeDirIfShould outside the lock to prevent OM stuck #9932

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

Closed
ivandika3 wants to merge 1 commit into from
+12 −4
Closed

HDDS-14841. Run createFakeDirIfShould outside the lock to prevent OM stuck #9932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,6 +1518,9 @@ private OzoneFileStatus getOzoneFileStatus(OmKeyArgs args,
OmKeyInfo fileKeyInfo = null;
OmKeyInfo dirKeyInfo = null;
OmKeyInfo fakeDirKeyInfo = null;
boolean needFakeDir = false;
BucketLayout layout = null;

metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
bucketName);
try {
Expand All @@ -1530,8 +1533,7 @@ private OzoneFileStatus getOzoneFileStatus(OmKeyArgs args,
// Check if the key is a file.
String fileKeyBytes = metadataManager.getOzoneKey(
volumeName, bucketName, keyName);
BucketLayout layout =
getBucketLayout(metadataManager, volumeName, bucketName);
layout = getBucketLayout(metadataManager, volumeName, bucketName);
fileKeyInfo = metadataManager.getKeyTable(layout).get(fileKeyBytes);
String dirKey = OzoneFSUtils.addTrailingSlashIfNeeded(keyName);

Expand All @@ -1541,8 +1543,7 @@ private OzoneFileStatus getOzoneFileStatus(OmKeyArgs args,
volumeName, bucketName, dirKey);
dirKeyInfo = metadataManager.getKeyTable(layout).get(dirKeyBytes);
if (dirKeyInfo == null) {
fakeDirKeyInfo =
createFakeDirIfShould(volumeName, bucketName, keyName, layout);
needFakeDir = true;
}
}
} finally {
Expand Down Expand Up @@ -1576,6 +1577,13 @@ private OzoneFileStatus getOzoneFileStatus(OmKeyArgs args,
return new OzoneFileStatus(dirKeyInfo, scmBlockSize, true);
}

// Called outside the lock: may open a RocksDB iterator that is slow
// when there are many tombstones to skip over.
if (needFakeDir) {
fakeDirKeyInfo =
createFakeDirIfShould(volumeName, bucketName, keyName, layout);
}

if (fakeDirKeyInfo != null) {
return new OzoneFileStatus(fakeDirKeyInfo, scmBlockSize, true);
}
Expand Down