diff options
| author | Michael Paquier <michael@paquier.xyz> | 2019-11-01 22:38:32 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2019-11-01 22:38:32 +0900 |
| commit | 20345197ff48c99a8a20dd3cd191d2aad5c7271c (patch) | |
| tree | d99d66a6027502daeb6d2a784bdc2dae0a5a8346 | |
| parent | 396773762425126a85243fc85a267d401496beb8 (diff) | |
| download | postgresql-20345197ff48c99a8a20dd3cd191d2aad5c7271c.tar.gz postgresql-20345197ff48c99a8a20dd3cd191d2aad5c7271c.zip | |
Fix race condition at backend exit when deleting element in syncrep queue
When a backend exits, it gets deleted from the syncrep queue if present.
The queue was checked without SyncRepLock taken in exclusive mode, so it
would have been possible for a backend to remove itself after a WAL
sender already did the job. Fix this issue based on a suggestion from
Fujii Masao, by first checking the queue without the lock. Then, if the
backend is present in the queue, take the lock and perform an additional
lookup check before doing the element deletion.
Author: Dongming Liu
Reviewed-by: Kyotaro Horiguchi, Fujii Masao, Michael Paquier
Discussion: https://postgr.es/m/a0806273-8bbb-43b3-bbe1-c45a58f6ae21.lingce.ldm@alibaba-inc.com
Backpatch-through: 9.4
| -rw-r--r-- | src/backend/replication/syncrep.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c index 16aee1de4c2..59a3d5bda6b 100644 --- a/src/backend/replication/syncrep.c +++ b/src/backend/replication/syncrep.c @@ -361,10 +361,18 @@ SyncRepCancelWait(void) void SyncRepCleanupAtProcExit(void) { + /* + * First check if we are removed from the queue without the lock to not + * slow down backend exit. + */ if (!SHMQueueIsDetached(&(MyProc->syncRepLinks))) { LWLockAcquire(SyncRepLock, LW_EXCLUSIVE); - SHMQueueDelete(&(MyProc->syncRepLinks)); + + /* maybe we have just been removed, so recheck */ + if (!SHMQueueIsDetached(&(MyProc->syncRepLinks))) + SHMQueueDelete(&(MyProc->syncRepLinks)); + LWLockRelease(SyncRepLock); } } |