postgrespro.git / summary / log / commit / refs

commit    caa3c4242cf86322e2ed0c86199e6462a2c41565
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Tue Jun 02 10:18:13 2020 +0000

    Don't call elog() while holding spinlock.
    
    Previously UpdateSpillStats() called elog(DEBUG2) while holding
    the spinlock even though the local variables that the elog() accesses
    don't need to be protected by the lock. Since spinlocks are intended
    for very short-term locks, they should not be used when calling
    elog(DEBUG2). So this commit moves that elog() out of spinlock period.
    
    Author: Kyotaro Horiguchi
    Reviewed-by: Amit Kapila and Fujii Masao
    Discussion: https://postgr.es/m/20200602.161518.1399689010416646074.horikyota.ntt@gmail.com


 src/backend/replication/walsender.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index 86847cbb54..2364cbfc61 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -3685,17 +3685,15 @@ UpdateSpillStats(LogicalDecodingContext *ctx)
 {
 	ReorderBuffer *rb = ctx->reorder;
 
-	SpinLockAcquire(&MyWalSnd->mutex);
-
-	MyWalSnd->spillTxns = rb->spillTxns;
-	MyWalSnd->spillCount = rb->spillCount;
-	MyWalSnd->spillBytes = rb->spillBytes;
-
 	elog(DEBUG2, "UpdateSpillStats: updating stats %p %lld %lld %lld",
 		 rb,
 		 (long long) rb->spillTxns,
 		 (long long) rb->spillCount,
 		 (long long) rb->spillBytes);
 
+	SpinLockAcquire(&MyWalSnd->mutex);
+	MyWalSnd->spillTxns = rb->spillTxns;
+	MyWalSnd->spillCount = rb->spillCount;
+	MyWalSnd->spillBytes = rb->spillBytes;
 	SpinLockRelease(&MyWalSnd->mutex);
 }


[parent: e641b2a995ab]