From 9b8a73326e99821caf33c36c081cb307e17422d4 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 28 Apr 2010 16:10:43 +0000 Subject: Introduce wal_level GUC to explicitly control if information needed for archival or hot standby should be WAL-logged, instead of deducing that from other options like archive_mode. This replaces recovery_connections GUC in the primary, where it now has no effect, but it's still used in the standby to enable/disable hot standby. Remove the WAL-logging of "unlogged operations", like creating an index without WAL-logging and fsyncing it at the end. Instead, we keep a copy of the wal_mode setting and the settings that affect how much shared memory a hot standby server needs to track master transactions (max_connections, max_prepared_xacts, max_locks_per_xact) in pg_control. Whenever the settings change, at server restart, write a WAL record noting the new settings and update pg_control. This allows us to notice the change in those settings in the standby at the right moment, they used to be included in checkpoint records, but that meant that a changed value was not reflected in the standby until the first checkpoint after the change. Bump PG_CONTROL_VERSION and XLOG_PAGE_MAGIC. Whack XLOG_PAGE_MAGIC back to the sequence it used to follow, before hot standby and subsequent patches changed it to 0x9003. --- src/backend/executor/execMain.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/backend/executor/execMain.c') diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 151299555cf..0b6cbcc4af0 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.348 2010/02/26 02:00:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.349 2010/04/28 16:10:42 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -2241,14 +2241,7 @@ CloseIntoRel(QueryDesc *queryDesc) /* If we skipped using WAL, must heap_sync before commit */ if (myState->hi_options & HEAP_INSERT_SKIP_WAL) - { - char reason[NAMEDATALEN + 30]; - - snprintf(reason, sizeof(reason), "SELECT INTO on \"%s\"", - RelationGetRelationName(myState->rel)); - XLogReportUnloggedStatement(reason); heap_sync(myState->rel); - } /* close rel, but keep lock until commit */ heap_close(myState->rel, NoLock); -- cgit v1.2.3