Skip to content

HDDS-11232. Spare InfoBucket RPC call for the FileSystem#getFileStatus calls for the general case. #6988

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
fapifta merged 2 commits into from
Jul 26, 2024
Merged

HDDS-11232. Spare InfoBucket RPC call for the FileSystem#getFileStatus calls for the general case. #6988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1fed55
HDDS-11232. Spare InfoBucket RPC call for the FileSystem#getFileStatu…
fapifta Jul 25, 2024
375b9f3
Address JUnit failures, and simplify access to the ClientProtocol's p…
fapifta Jul 25, 2024
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
2 changes: 2 additions & 0 deletions hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2156,6 +2156,8 @@ public OzoneMultipartUploadList listMultipartUploads(String volumeName,
@Override
public OzoneFileStatus getOzoneFileStatus(String volumeName,
String bucketName, String keyName) throws IOException {
verifyVolumeName(volumeName);
verifyBucketName(bucketName);
OmKeyArgs keyArgs = new OmKeyArgs.Builder()
.setVolumeName(volumeName)
.setBucketName(bucketName)
Expand Down
17 changes: 8 additions & 9 deletions ...fs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,20 +659,19 @@ public FileStatusAdapter getFileStatus(String path, URI uri,
* valid bucket path or valid snapshot path.
* Throws exception in case of failure.
*/
private FileStatusAdapter getFileStatusForKeyOrSnapshot(
OFSPath ofsPath, URI uri, Path qualifiedPath, String userName)
private FileStatusAdapter getFileStatusForKeyOrSnapshot(OFSPath ofsPath, URI uri, Path qualifiedPath, String userName)
throws IOException {
String volumeName = ofsPath.getVolumeName();
String bucketName = ofsPath.getBucketName();
String key = ofsPath.getKeyName();
try {
OzoneBucket bucket = getBucket(ofsPath, false);
if (ofsPath.isSnapshotPath()) {
OzoneVolume volume = objectStore.getVolume(ofsPath.getVolumeName());
return getFileStatusAdapterWithSnapshotIndicator(
volume, bucket, uri);
OzoneVolume volume = objectStore.getVolume(volumeName);
OzoneBucket bucket = getBucket(volumeName, bucketName, false);
return getFileStatusAdapterWithSnapshotIndicator(volume, bucket, uri);
} else {
OzoneFileStatus status = bucket.getFileStatus(key);
return toFileStatusAdapter(status, userName, uri, qualifiedPath,
ofsPath.getNonKeyPath());
OzoneFileStatus status = proxy.getOzoneFileStatus(volumeName, bucketName, key);
return toFileStatusAdapter(status, userName, uri, qualifiedPath, ofsPath.getNonKeyPath());
}
} catch (OMException e) {
if (e.getResult() == OMException.ResultCodes.FILE_NOT_FOUND) {
Expand Down