Commit 8a7025f0 authored by Tom Lane's avatar Tom Lane

Move pgstat_report_tabstat() call so that stats are not reported to the

collector until the transaction commits.  Per recent discussion, this
should avoid confusing autovacuum when an updating transaction runs for
a long time.
parent e719591e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.437 2004/11/14 19:35:31 tgl Exp $ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.438 2004/11/20 00:48:58 tgl Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
...@@ -2904,12 +2904,11 @@ PostgresMain(int argc, char *argv[], const char *username) ...@@ -2904,12 +2904,11 @@ PostgresMain(int argc, char *argv[], const char *username)
* This is also a good time to send collected statistics to the * This is also a good time to send collected statistics to the
* collector, and to update the PS stats display. We avoid doing * collector, and to update the PS stats display. We avoid doing
* those every time through the message loop because it'd slow * those every time through the message loop because it'd slow
* down processing of batched messages. * down processing of batched messages, and because we don't want
* to report uncommitted updates (that confuses autovacuum).
*/ */
if (send_rfq) if (send_rfq)
{ {
pgstat_report_tabstat();
if (IsTransactionOrTransactionBlock()) if (IsTransactionOrTransactionBlock())
{ {
set_ps_display("idle in transaction"); set_ps_display("idle in transaction");
...@@ -2917,6 +2916,8 @@ PostgresMain(int argc, char *argv[], const char *username) ...@@ -2917,6 +2916,8 @@ PostgresMain(int argc, char *argv[], const char *username)
} }
else else
{ {
pgstat_report_tabstat();
set_ps_display("idle"); set_ps_display("idle");
pgstat_report_activity("<IDLE>"); pgstat_report_activity("<IDLE>");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment