You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@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:
Remove ReplicationSource reference from branch-1 and make findbugs happy. This will create some difference in code between branch-1 and branch-2/master.
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 !
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Master branch PR: #2945
branch-2 PR: #2962