smengcl edited a comment on pull request #1021: URL: https://github.com/apache/hadoop-ozone/pull/1021#issuecomment-641415084
> Thanks to drive this effort @smengcl. Overall it looks good to me. I agree that we are in the last step before the merge. > > I have some questions about the code. > > (And I feel myself guilty of the conflict, I can explain the changes on the master what I did, or I can help to rebase it.) Thanks for the comment @elek . The merge conflict comes from HDDS-3627 ([commit](https://github.com/apache/hadoop-ozone/commit/072370b947416d89fae11d00a84a1d9a6b31beaa)) as far as I can tell. Shouldn't be a big problem. It is always a delight to see good refactoring. :) A question though. I notice `TestOzoneFileSystemWithMocks` being removed in HDDS-3627, where in OFS I forked it to create `TestRootedOzoneFileSystemWithMocks`. Should I relocate the latter to somewhere else or just remove it as well? For now I will move it under `hadoop-ozone/ozonefs-common/src/test/java/org/apache/hadoop/fs/ozone/` to be in the same place with `TestOzoneFSInputStream.java`. The merge conflict resolution work is being done in HDDS-3767. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
