Revoke augmentation of WAL records for btree delete, per discussion.

4 files changed, 12 insertions, 29 deletions

diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 5fa4724602f..71b23644e2b 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.116 2010/01/29 18:39:05 sriggs Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.117 2010/02/01 13:40:28 sriggs Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -29,7 +29,6 @@
 #include "storage/freespace.h"
 #include "storage/indexfsm.h"
 #include "storage/lmgr.h"
-#include "storage/procarray.h"
 #include "utils/inval.h"
 #include "utils/snapmgr.h"
 
@@ -672,18 +671,9 @@ _bt_delitems(Relation rel, Buffer buf,
 {
 	Page		page = BufferGetPage(buf);
 	BTPageOpaque opaque;
-	TransactionId latestRemovedXid = InvalidTransactionId;
 
 	Assert(isVacuum || lastBlockVacuumed == 0);
 
-	/*
-	 * If allowed, calculate an accurate latestRemovedXid, otherwise
-	 * pass InvalidTransactionId which can cause false positive
-	 * conflicts to be assessed when we replay this WAL record.
-	 */
-	if (!isVacuum && XLogStandbyInfoActive() && MinimizeStandbyConflicts)
-		latestRemovedXid = GetOldestXmin(false, true);
-
 	/* No ereport(ERROR) until changes are logged */
 	START_CRIT_SECTION();
 
@@ -731,7 +721,13 @@ _bt_delitems(Relation rel, Buffer buf,
 			xlrec_delete.node = rel->rd_node;
 			xlrec_delete.block = BufferGetBlockNumber(buf);
 
-			xlrec_delete.latestRemovedXid = latestRemovedXid;
+			/*
+			 * XXX: We would like to set an accurate latestRemovedXid, but
+			 * there is no easy way of obtaining a useful value. So we punt
+			 * and store InvalidTransactionId, which forces the standby to
+			 * wait for/cancel all currently running transactions.
+			 */
+			xlrec_delete.latestRemovedXid = InvalidTransactionId;
 			rdata[0].data = (char *) &xlrec_delete;
 			rdata[0].len = SizeOfBtreeDelete;
 		}
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 8aa7976e3e3..49adda12f9a 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.365 2010/01/29 18:39:05 sriggs Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.366 2010/02/01 13:40:28 sriggs Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -71,7 +71,6 @@ bool		XLogArchiveMode = false;
 char	   *XLogArchiveCommand = NULL;
 bool 		XLogRequestRecoveryConnections = true;
 int			MaxStandbyDelay = 30;
-bool		MinimizeStandbyConflicts = false;
 bool		fullPageWrites = true;
 bool		log_checkpoints = false;
 int			sync_method = DEFAULT_SYNC_METHOD;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index adf9f72b359..642fc6796a3 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.537 2010/01/29 18:39:05 sriggs Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.538 2010/02/01 13:40:28 sriggs Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -1223,17 +1223,6 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 
 	{
-		{"minimize_standby_conflicts", PGC_POSTMASTER, WAL_SETTINGS,
-			gettext_noop("Additional information is added to WAL records to"
-						 " minimize the number of false positive cancelations"
-						 " caused by recovery conflicts on WAL standby nodes."),
-			NULL
-		},
-		&MinimizeStandbyConflicts,
-		false, NULL, NULL
-	},
-
-	{
 		{"allow_system_table_mods", PGC_POSTMASTER, DEVELOPER_OPTIONS,
 			gettext_noop("Allows modifications of the structure of system tables."),
 			NULL,
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 928ccc76edf..c915d19d66f 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -184,9 +184,8 @@
 # - Hot Standby -
 
 #recovery_connections = on	# allows connections during recovery
-#minimize_standby_conflicts = on # additional WAL info to avoid conflicts
-#max_standby_delay = 30		# max acceptable standby lag (s) to help queries
-				# complete without conflict; -1 disables
+#max_standby_delay = 30		# max acceptable standby lag (s) to allow queries
+				# to complete without conflict; -1 disables
 
 # - Replication -