ChenSammi commented on code in PR #10009:
URL: https://github.com/apache/ozone/pull/10009#discussion_r3271288431
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java:
##########
@@ -112,15 +114,50 @@ public OMClientRequest(OMRequest omRequest) {
*/
public OMRequest preExecute(OzoneManager ozoneManager)
throws IOException {
- LayoutVersion layoutVersion = LayoutVersion.newBuilder()
+ final LayoutVersion layoutVersion = LayoutVersion.newBuilder()
.setVersion(ozoneManager.getVersionManager().getMetadataLayoutVersion())
.build();
- omRequest = getOmRequest().toBuilder()
+
+ final OMRequest.Builder requestBuilder = getOmRequest().toBuilder()
.setUserInfo(getUserIfNotExists(ozoneManager))
- .setLayoutVersion(layoutVersion).build();
+ .setLayoutVersion(layoutVersion);
+
+ if (requestBuilder.hasS3Authentication()) {
+ requestBuilder.setS3Authentication(
+ resolveS3Authentication(requestBuilder.getS3Authentication(),
OzoneManager.getStsTokenIdentifier()));
+ }
+
+ omRequest = requestBuilder.build();
return omRequest;
}
+ private static OzoneManagerProtocolProtos.S3Authentication
resolveS3Authentication(
+ OzoneManagerProtocolProtos.S3Authentication s3Auth, STSTokenIdentifier
stsTokenIdentifier) {
+ final OzoneManagerProtocolProtos.S3Authentication.Builder s3AuthBuilder =
s3Auth.toBuilder();
+
+ if (s3Auth.hasSessionToken() && !s3Auth.getSessionToken().isEmpty() &&
stsTokenIdentifier != null) {
Review Comment:
Is "s3Auth.hasSessionToken() && !s3Auth.getSessionToken().isEmpty()" and
null stsTokenIdentifier allowed?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
