Skip to content

Resolve conflicts in src/backend/replication/syncrep.c #2586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RekGRpth merged 2 commits into from
May 29, 2026
+0 −19
Merged

Resolve conflicts in src/backend/replication/syncrep.c #2586

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b509d14
Resolve conflicts in src/backend/replication/syncrep.c
RekGRpth May 25, 2026
0210f28
rm
RekGRpth May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions src/backend/replication/syncrep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,6 @@ SyncRepWaitForLSN(XLogRecPtr lsn, bool commit)
const char *old_status;
int mode;

<<<<<<< HEAD
=======
/*
* This should be called while holding interrupts during a transaction
* commit to prevent the follow-up shared memory queue cleanups to be
* influenced by external interruptions.
*/
Assert(InterruptHoldoffCount > 0);

/*
* Fast exit if user has not requested sync replication, or there are no
* sync replication standby names defined.
Expand All @@ -187,27 +178,17 @@ SyncRepWaitForLSN(XLogRecPtr lsn, bool commit)
!((volatile WalSndCtlData *) WalSndCtl)->sync_standbys_defined)
return;

>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
/* Cap the level for anything other than commit to remote flush only. */
if (commit)
mode = SyncRepWaitMode;
else
mode = Min(SyncRepWaitMode, SYNC_REP_WAIT_FLUSH);

<<<<<<< HEAD
Assert(!am_walsender);
elogif(debug_walrepl_syncrep, LOG,
"syncrep wait -- This backend's commit LSN for syncrep is %X/%X.",
(uint32) (lsn >> 32), (uint32) lsn);

/*
* Fast exit if user has not requested sync replication.
*/
if (!SyncRepRequested())
return;

=======
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
Assert(SHMQueueIsDetached(&(MyProc->syncRepLinks)));
Assert(WalSndCtl != NULL);

Expand Down