From e05f6f75dbe00a7349dccf1116b5ed983b4728c0 Mon Sep 17 00:00:00 2001 From: Simon Riggs Date: Fri, 12 Aug 2016 12:43:45 +0100 Subject: [PATCH] Code cleanup in SyncRepWaitForLSN() Commit 14e8803f1 removed LWLocks when accessing MyProc->syncRepState but didn't clean up the surrounding code and comments. Cleanup and backpatch to 9.5, to keep code similar. Julien Rouhaud, improved by suggestion from Michael Paquier, implemented trivially by myself. --- src/backend/replication/syncrep.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c index 67249d80c8b..47a67cf4b14 100644 --- a/src/backend/replication/syncrep.c +++ b/src/backend/replication/syncrep.c @@ -189,24 +189,16 @@ SyncRepWaitForLSN(XLogRecPtr lsn, bool commit) */ for (;;) { - int syncRepState; - /* Must reset the latch before testing state. */ ResetLatch(MyLatch); /* - * Try checking the state without the lock first. There's no - * guarantee that we'll read the most up-to-date value, so if it looks - * like we're still waiting, recheck while holding the lock. But if - * it looks like we're done, we must really be done, because once - * walsender changes the state to SYNC_REP_WAIT_COMPLETE, it will - * never update it again, so we can't be seeing a stale value in that - * case. + * Acquiring the lock is not needed, the latch ensures proper barriers. + * If it looks like we're done, we must really be done, because once + * walsender changes the state to SYNC_REP_WAIT_COMPLETE, it will never + * update it again, so we can't be seeing a stale value in that case. */ - syncRepState = MyProc->syncRepState; - if (syncRepState == SYNC_REP_WAITING) - syncRepState = MyProc->syncRepState; - if (syncRepState == SYNC_REP_WAIT_COMPLETE) + if (MyProc->syncRepState == SYNC_REP_WAIT_COMPLETE) break; /*