[GitHub] [ozone] GeorgeJahad commented on pull request #2977: HDDS-6173. Merge master branch including s3g persistent connection changes into feature branch

[GitBox <gi...@apache.org>]

GeorgeJahad commented on pull request #2977:
URL: https://github.com/apache/ozone/pull/2977#issuecomment-1010646732


   Hey Neil, 800 files seems like a lot of files to review.  I wonder if we could make it easier.
   
   If I'm understanding things correctly, there are really just 15 files that really need to be reviewed.  Here are those diffs:
   
   https://github.com/GeorgeJahad/ozone/compare/HDDS-4440-updated-feature-branch..neils-dev:5881_merge
   
   Note that diff is between a branch I created from the old feature branch, and your 5881_merge branch.
   
   To understand the diff better let me describe how the two branches were created.
   
   To create your 5881_merge branch, you:
   * started from the feature branch, 
   * merged in the latest master, 30cb5e7644fc3fcb524ba9ede9059a118b03f2fd, 
   * resolved the merge conflicts, and 
   * integrated the s3 grpc changes with the hadoop rpc changes.
   
   
   To create my branch, I:
   * got the s3grpc diffs from the old feature branch and 
   * patched 30cb5e7644fc3fcb524ba9ede9059a118b03f2fd with it. 
    
   I let the merge conflicts be rejected, and didn't try to integrate the hrpc changes.
   
   Here is the code:
   
   ```
   # tag the last master merged into the feature branch
   git tag oldGrpcMaster db574d1cfffc8c0a57bef4dcdec008bb6c6c3fba
   
   # get the s3grpc changes in the old feature branch
   git diff oldGrpcMaster  HDDS-4440-s3-performance > /tmp/s3grpc.diff
   
   # tag the master that will be the basis of the new feature branch
   git tag newGrpcMaster 30cb5e7644fc3fcb524ba9ede9059a118b03f2fd
   
   #create updated feature branch
   git checkout newGrpcMaster
   git checkout -b HDDS-4440-updated-feature-branch
   
   # Now patch the new feature branch with the s3grpc changes
   # note that the changes that don't merge cleanly will be rejected
   # and will be resolved by hand in the next commit
   patch -p1 -f < /tmp/s3grpc.diff
   git add .
   git commit -m "added s3grpc changes not including merge conflicts"
   ```
   
   
   Now that branch has all the s3grpc changes commited up to now, without resolving any merge conflicts, or integrating the grpc changes with hadoop rpc.
   
   Those are things you added, and I think are the main things the reviewers want to see.
   
   They get those diffs by comparing my branch with yours.  
   
   What do you think?
   


-- 
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: issues-unsubscribe@ozone.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For additional commands, e-mail: issues-help@ozone.apache.org