HDDS-11232. Avoid redundant getBucketInfo RPC on OFS getFileStatus#10792
Open
jojochuang wants to merge 4 commits into
Open
HDDS-11232. Avoid redundant getBucketInfo RPC on OFS getFileStatus#10792jojochuang wants to merge 4 commits into
jojochuang wants to merge 4 commits into
Conversation
Cache validated bucket layouts per volume/bucket and call GetFileStatus directly after cache warm-up, preserving layout checks and headOp behavior. Co-authored-by: Cursor <cursoragent@cursor.com> Change-Id: Icddbc99fee0cf0e78e52919283f93d29a1986a1c
jojochuang
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR optimizes ofs:// getFileStatus() by caching per-bucket layout validation in BasicRootedOzoneClientAdapterImpl, so repeated getFileStatus() calls can avoid an extra getBucketInfo/getBucketDetails round-trip and rely on a single OM GetFileStatus RPC after warm-up.
Changes:
- Added a
(volume, bucket)-scoped in-memory cache for validated bucket layouts and wired it into the bucket-resolution path. - Updated non-snapshot
getFileStatusto validate bucket layout once (cached) and then callproxy.getOzoneFileStatus(...)directly. - Added integration tests asserting RPC-count behavior after cache warm-up and covering bucket-root stats, OBS-bucket layout rejection, and missing-file behavior.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java | Introduces cached bucket-layout validation and routes getFileStatus through a single OM RPC after warm-up. |
| hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java | Adds integration coverage for the single-RPC behavior and additional getFileStatus edge cases. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+314
to
+322
| private void ensureBucketLayoutValid(OFSPath ofsPath) throws IOException { | ||
| String volumeStr = ofsPath.getVolumeName(); | ||
| String bucketStr = ofsPath.getBucketName(); | ||
| if (validatedBucketLayouts.containsKey( | ||
| bucketLayoutCacheKey(volumeStr, bucketStr))) { | ||
| return; | ||
| } | ||
| resolveAndValidateBucketLayout(volumeStr, bucketStr); | ||
| } |
Comment on lines
+1886
to
+1888
| } finally { | ||
| objectStore.deleteVolume(obsBucket.getVolumeName()); | ||
| } |
jojochuang
marked this pull request as draft
July 17, 2026 20:20
Delete the bucket before removing the volume to avoid VOLUME_NOT_EMPTY. Co-authored-by: Cursor <cursoragent@cursor.com> Change-Id: Iddfefe48d716e77cb58501514c919a44194cdae7
Comment on lines
+314
to
+322
| private void ensureBucketLayoutValid(OFSPath ofsPath) throws IOException { | ||
| String volumeStr = ofsPath.getVolumeName(); | ||
| String bucketStr = ofsPath.getBucketName(); | ||
| if (validatedBucketLayouts.containsKey( | ||
| bucketLayoutCacheKey(volumeStr, bucketStr))) { | ||
| return; | ||
| } | ||
| resolveAndValidateBucketLayout(volumeStr, bucketStr); | ||
| } |
Comment on lines
+136
to
+140
| /** | ||
| * Cache of successfully validated bucket layouts for read paths. | ||
| */ | ||
| private final ConcurrentHashMap<String, BucketLayout> validatedBucketLayouts = | ||
| new ConcurrentHashMap<>(); |
jojochuang
marked this pull request as ready for review
July 17, 2026 21:32
Co-authored-by: Cursor <cursoragent@cursor.com> Change-Id: Ifc177a61594da562cc3cbc13b6f622fada55971d
Mock ClientProtocol and warm the layout cache after getFileStatus stopped calling OzoneBucket.getFileStatus for non-snapshot paths. Co-authored-by: Cursor <cursoragent@cursor.com> Change-Id: I34e369396f682c096fa23b0f5df7b8b165feab6f
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (1)
hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java:756
- validatedBucketLayouts is never invalidated. If a bucket is deleted and later re-created (potentially with a different layout), a cached entry can cause future getFileStatus() calls to skip layout validation and bypass OBJECT_STORE rejection. At minimum, clear the cache entry when OM reports BUCKET_NOT_FOUND so the next call revalidates against the current bucket definition.
} catch (OMException e) {
if (e.getResult() == OMException.ResultCodes.FILE_NOT_FOUND) {
throw new FileNotFoundException(key + ": No such file or directory!");
} else if (e.getResult() == OMException.ResultCodes.BUCKET_NOT_FOUND) {
throw new FileNotFoundException(key + ": Bucket doesn't exist!");
Comment on lines
+100
to
+107
| Field cacheField = | ||
| BasicRootedOzoneClientAdapterImpl.class.getDeclaredField( | ||
| "validatedBucketLayouts"); | ||
| cacheField.setAccessible(true); | ||
| ConcurrentHashMap<String, BucketLayout> cache = | ||
| new ConcurrentHashMap<>(); | ||
| cache.put(volumeName + "/" + bucketName, BucketLayout.FILE_SYSTEM_OPTIMIZED); | ||
| cacheField.set(adapter, cache); |
jojochuang
changed the title
Contributor
Author
|
@yandrey321 this PR aims to remove the extra RPC call in most cases. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
(volume, bucket)inBasicRootedOzoneClientAdapterImplgetFileStatus()onofs://sends one client→OMGetFileStatusRPC instead ofgetBucketInfo+GetFileStatusheadOppropagationTest plan
mvn -pl :ozone-filesystem-common -am compileTestOFS#testGetFileStatusUsesSingleOmRpcAfterCacheWarmand related new casesGenerated-by: Cursor (Composer)
Made with Cursor