shahrs87 commented on pull request #2963: URL: https://github.com/apache/hbase/pull/2963#issuecomment-783450667
@bharathv I have fixed the test failures. Code in branch-1 and branch-2 are very different. So missed to apply some changes while resolving merge conflicts. There is 1 findbugs warning. That is because of an unused variable `ReplicationSource source` in newly created `ReplicationSourceLogQueue` class. In master and branch-2, we refer to ReplicationSource class to print some log line with peerId. We get that peerId from ReplicationSource class. But in branch-1, we don't have that logline. I have the following options with me: 1. Remove ReplicationSource reference from branch-1 and make findbugs happy. This will create some difference in code between branch-1 and branch-2/master. 2. Keep as it is and introduce 1 extra findbugs warning. I would like to have minimal code difference so I prefer option#2 but open for suggestions. Thank you ! ---------------------------------------------------------------- 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]
