chihsuan commented on code in PR #11449:
URL: https://github.com/apache/ozone/pull/11449#discussion_r4301115309


##########
hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneManagerVersion.java:
##########
@@ -74,6 +74,9 @@ public enum OzoneManagerVersion implements ComponentVersion {
           + "client-side InfoBucket layout check for getFileChecksum"),
   ZDU(100, "OzoneManager version that supports zero downtime upgrade"),
 
+  S3_MULTIPART_UPLOAD_ABORT_CONTEXT(101,

Review Comment:
   I just found master already took 101. Could we bump this to the next free 
number? Git won't flag it as a conflict.



##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/execution/OMExecutionFlow.java:
##########
@@ -64,8 +64,10 @@ private OMResponse submitExecutionToRatis(OMRequest request, 
boolean isWrite) th
         omClientRequest = OzoneManagerRatisUtils.createClientRequest(request, 
ozoneManager);
         assert (omClientRequest != null);
         final OMClientRequest finalOmClientRequest = omClientRequest;
-        requestToSubmit = 
captureLatencyNs(perfMetrics.getPreExecuteLatencyNs(),
+        OMRequest preExecuted = 
captureLatencyNs(perfMetrics.getPreExecuteLatencyNs(),
             () -> finalOmClientRequest.preExecute(ozoneManager));
+        requestToSubmit = preExecuted.hasAssumeS3Context()
+            ? preExecuted.toBuilder().clearAssumeS3Context().build() : 
preExecuted;

Review Comment:
   Could we add a `TestOMExecutionFlow` check that this clears the flag? The 
`assertFalse` was dropped in the move, so removing this line keeps unit tests 
green.



-- 
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]

Reply via email to