From f7ab71ba0c7bcf237403d40269aeea0a0f2551df Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Thu, 23 May 2024 13:47:12 +0900 Subject: [PATCH] Fix typo and comments related to the recent no-wait lock improvements The argument of dontWait at the top of ProcSleep() was documented backwards, and there was a typo in lock.c. Thinkos in 2346df6fc373. Author: Will Mortensen Reviewed-by: Jingxian Li, Michael Paquier Discussion: https://postgr.es/m/CAMpnoC5f+eiS7tdy8PUpd_LacSTVT-pYpVooKfjHRQQmkHPZ2g@mail.gmail.com --- src/backend/storage/lmgr/lock.c | 2 +- src/backend/storage/lmgr/proc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 9e4ddf72258..f68c595c8a4 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -1060,7 +1060,7 @@ LockAcquireExtended(const LOCKTAG *locktag, /* * Check the proclock entry status. If dontWait = true, this is an - * expected case; otherwise, it will open happen if something in the + * expected case; otherwise, it will only happen if something in the * ipc communication doesn't work correctly. */ if (!(proclock->holdMask & LOCKBIT_ON(lockmode))) diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index a2900b6014a..ce29da90121 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -1054,8 +1054,8 @@ AuxiliaryPidGetProc(int pid) * at exit. * * Result: PROC_WAIT_STATUS_OK if we acquired the lock, PROC_WAIT_STATUS_ERROR - * if not (if dontWait = true, this is a deadlock; if dontWait = false, we - * would have had to wait). + * if not (if dontWait = true, we would have had to wait; if dontWait = false, + * this is a deadlock). * * ASSUME: that no one will fiddle with the queue until after * we release the partition lock.