mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-21 08:29:39 +08:00
Additional test for each commit in sync rep path to plug minute
possibility of race condition that would effect performance only. Requested by Robert Haas. Re-arrange related comments.
This commit is contained in:
parent
bfa4440ca5
commit
92f4786fa9
@ -114,21 +114,28 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
|
|||||||
/* Reset the latch before adding ourselves to the queue. */
|
/* Reset the latch before adding ourselves to the queue. */
|
||||||
ResetLatch(&MyProc->waitLatch);
|
ResetLatch(&MyProc->waitLatch);
|
||||||
|
|
||||||
|
LWLockAcquire(SyncRepLock, LW_EXCLUSIVE);
|
||||||
|
Assert(MyProc->syncRepState == SYNC_REP_NOT_WAITING);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We don't wait for sync rep if WalSndCtl->sync_standbys_defined is
|
||||||
|
* not set. See SyncRepUpdateSyncStandbysDefined.
|
||||||
|
*
|
||||||
|
* Also check that the standby hasn't already replied. Unlikely
|
||||||
|
* race condition but we'll be fetching that cache line anyway
|
||||||
|
* so its likely to be a low cost check.
|
||||||
|
*/
|
||||||
|
if (!WalSndCtl->sync_standbys_defined ||
|
||||||
|
XLByteLE(XactCommitLSN, WalSndCtl->lsn))
|
||||||
|
{
|
||||||
|
LWLockRelease(SyncRepLock);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set our waitLSN so WALSender will know when to wake us, and add
|
* Set our waitLSN so WALSender will know when to wake us, and add
|
||||||
* ourselves to the queue.
|
* ourselves to the queue.
|
||||||
*/
|
*/
|
||||||
LWLockAcquire(SyncRepLock, LW_EXCLUSIVE);
|
|
||||||
Assert(MyProc->syncRepState == SYNC_REP_NOT_WAITING);
|
|
||||||
if (!WalSndCtl->sync_standbys_defined)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* We don't wait for sync rep if WalSndCtl->sync_standbys_defined is
|
|
||||||
* not set. See SyncRepUpdateSyncStandbysDefined.
|
|
||||||
*/
|
|
||||||
LWLockRelease(SyncRepLock);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
MyProc->waitLSN = XactCommitLSN;
|
MyProc->waitLSN = XactCommitLSN;
|
||||||
MyProc->syncRepState = SYNC_REP_WAITING;
|
MyProc->syncRepState = SYNC_REP_WAITING;
|
||||||
SyncRepQueueInsert();
|
SyncRepQueueInsert();
|
||||||
|
Loading…
Reference in New Issue
Block a user