smengcl opened a new pull request, #6743: URL: https://github.com/apache/ozone/pull/6743
Note to committers: DO NOT use the "Squash and merge" button to merge this. ## What changes were proposed in this pull request? Merge new commits from master branch to the HDDS-7593 feature branch, and resolve any conflicts. ``` Conflicts: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java ``` 1. `TestBlockOutputStream`: added `enablePutblockPiggybacking` to amend assertion calculation 2. `BasicOzoneClientAdapterImpl`: adopted the master branch implementation of `isFileClosed` by @chungen0126 ## What is the link to the Apache JIRA https://issues.apache.org/jira/browse/HDDS-10922 ## How was this patch tested? - All existing tests must pass. -- 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]
