Fix old bug in log_autovacuum_min_duration code: it was relying on being able

to access a Relation entry it had just closed.  I happened to be testing with
CLOBBER_CACHE_ALWAYS, which made this a guaranteed core dump (at least on
machines where sprintf %s isn't forgiving of a NULL pointer).  It's probably
quite unlikely that it would fail in the field, but a bug is a bug.  Fix by
moving the relation_close call down past the logging action.

diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index e1e3498c7c6011e128e61cbf5422c095437488c5..f442bf653609b9a56f1b394b1d5ecd37568f05d5 100644 (file)
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.114.2.2 2009/05/19 08:30:12 heikki Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.114.2.3 2009/08/12 18:24:03 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -467,14 +467,6 @@ cleanup:
        /* Done with indexes */
        vac_close_indexes(nindexes, Irel, NoLock);
 
-       /*
-        * Close source relation now, but keep lock so that no one deletes it
-        * before we commit.  (If someone did, they'd fail to clean up the entries
-        * we made in pg_statistic.  Also, releasing the lock before commit would
-        * expose us to concurrent-update failures in update_attstats.)
-        */
-       relation_close(onerel, NoLock);
-
        /* Log the action if appropriate */
        if (IsAutoVacuumWorkerProcess() && Log_autovacuum_min_duration >= 0)
        {
@@ -489,6 +481,14 @@ cleanup:
                                                        pg_rusage_show(&ru0))));
        }
 
+       /*
+        * Close source relation now, but keep lock so that no one deletes it
+        * before we commit.  (If someone did, they'd fail to clean up the entries
+        * we made in pg_statistic.  Also, releasing the lock before commit would
+        * expose us to concurrent-update failures in update_attstats.)
+        */
+       relation_close(onerel, NoLock);
+
        /*
         * Reset my PGPROC flag.  Note: we need this here, and not in vacuum_rel,
         * because the vacuum flag is cleared by the end-of-xact code.