diff options
| author | Andres Freund <andres@anarazel.de> | 2022-05-12 18:49:33 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2022-05-12 18:54:26 -0700 |
| commit | 0cf16cb8ca4853b084c40eca310c4c9c3ebf7e2a (patch) | |
| tree | 295524964960bfec445c0cefece8830fbc1cd7f6 /src | |
| parent | 8d3341266508fc1aed1f1a6bdb4ed885821c81b0 (diff) | |
| download | postgresql-0cf16cb8ca4853b084c40eca310c4c9c3ebf7e2a.tar.gz postgresql-0cf16cb8ca4853b084c40eca310c4c9c3ebf7e2a.zip | |
Don't report stats in LogicalRepApplyLoop() when in xact.
pgstat_report_stat() is only supposed to be called outside of transactions. In
5891c7a8ed8 I added a pgstat_report_stat() call into LogicalRepApplyLoop()'s
timeout branch. While not commonly reached inside a transaction, it is
reachable (e.g. due to network bottlenecks or the sender being stalled / slow
for some reason).
To fix, add a !IsTransactionState() check.
No test added because there's no easy way to reproduce this case without
patching the code.
Reported-By: Erik Rijkers <er@xs4all.nl>
Discussion: https://postgr.es/m/b3463b8c-2328-dcac-0136-af95715493c1@xs4all.nl
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/replication/logical/worker.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index 3b80ed92c07..fc210a9e7b9 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -2883,9 +2883,14 @@ LogicalRepApplyLoop(XLogRecPtr last_received) /* * Force reporting to ensure long idle periods don't lead to - * arbitrarily delayed stats. + * arbitrarily delayed stats. Stats can only be reported outside + * of (implicit or explicit) transactions. That shouldn't lead to + * stats being delayed for long, because transactions are either + * sent as a whole on commit or streamed. Streamed transactions + * are spilled to disk and applied on commit. */ - pgstat_report_stat(true); + if (!IsTransactionState()) + pgstat_report_stat(true); } } |