Skip to content

HDDS-9447. Redundant ACL checks in getKeyInfo for S3 use case #5440

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
adoroszlai merged 3 commits into from
Oct 19, 2023
Merged

HDDS-9447. Redundant ACL checks in getKeyInfo for S3 use case #5440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d17a673
HDDS-9447. Redundant ACL checks in getKeyInfo for S3 use case
duongkame Oct 13, 2023
65695b4
rename var.
duongkame Oct 18, 2023
84cb09f
Update hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozo…
duongkame Oct 19, 2023
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: 1 addition & 1 deletion hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public KeyInfoWithVolumeContext getKeyInfo(final OmKeyArgs args,

final OmKeyArgs resolvedVolumeArgs;
if (assumeS3Context) {
S3VolumeContext context = ozoneManager.getS3VolumeContext();
S3VolumeContext context = ozoneManager.getS3VolumeContext(true);
s3VolumeContext = java.util.Optional.of(context);
resolvedVolumeArgs = args.toBuilder()
.setVolumeName(context.getOmVolumeArgs().getVolume())
Expand Down
18 changes: 16 additions & 2 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3436,6 +3436,10 @@ public TenantUserList listUsersInTenant(String tenantId, String prefix)

@Override
public S3VolumeContext getS3VolumeContext() throws IOException {
return getS3VolumeContext(false);
}

S3VolumeContext getS3VolumeContext(boolean skipChecks) throws IOException {
long start = Time.monotonicNowNanos();
// Unless the OM request contains S3 authentication info with an access
// ID that corresponds to a tenant volume, the request will be directed
Expand Down Expand Up @@ -3515,9 +3519,19 @@ public S3VolumeContext getS3VolumeContext() throws IOException {
}
}

// getVolumeInfo() performs acl checks and checks volume existence.

final OmVolumeArgs volumeInfo;
if (skipChecks) {
// for internal usages, skip acl checks and metrics.
volumeInfo = volumeManager.getVolumeInfo(s3Volume);
} else {
// for external usages, getVolumeInfo() performs acl checks
// and metric updates.
volumeInfo = getVolumeInfo(s3Volume);
}

final S3VolumeContext.Builder s3VolumeContext = S3VolumeContext.newBuilder()
.setOmVolumeArgs(getVolumeInfo(s3Volume))
.setOmVolumeArgs(volumeInfo)
.setUserPrincipal(userPrincipal);
perfMetrics.addS3VolumeContextLatencyNs(Time.monotonicNowNanos() - start);
return s3VolumeContext.build();
Expand Down