Resolve conflicts in src/backend/replication/syncrep.c#2586
Merged
Conversation
Commit be9788e in src/backend/replication/syncrep.c in the SyncRepWaitForLSN function moved the conditional return higher, adding additional conditions and a large comment. Commit e174f69 added an InterruptHoldoffCount assertion before it. However, the earlier commit 6b0e52b had already added a debug log in the same location, and commit 33a6433 added an assertion before it.
silent-observer
approved these changes
May 25, 2026
silent-observer
approved these changes
May 29, 2026
KnightMurloc
approved these changes
May 29, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Commit be9788e in src/backend/replication/syncrep.c in the
SyncRepWaitForLSN function moved the conditional return higher, adding
additional conditions and a large comment. Commit e174f69 added an
InterruptHoldoffCount assertion before it. However, the earlier commit
6b0e52b had already added a debug log in the same location, and commit
33a6433 added an assertion before it, and commit bdb1ea1 removed
InterruptHoldoffCount assertion.