From: Andres Freund <andres@anarazel.de>
Date: Thu, 20 Aug 2020 19:59:00 +0000 (-0700)
Subject: Revert "Make vacuum a bit more verbose to debug BF failure."
X-Git-Url: http://git.postgresql.org/gitweb/static/maillist.html?a=commitdiff_plain;h=c62a0a49f33a0d45a97aa1d3a5bc6ddc83f10d82;p=users%2Fgsingh%2Fpostgres.git

Revert "Make vacuum a bit more verbose to debug BF failure."

This reverts commit 49967da65aec970fcda123acc681f1df5d70bfc6.

Enough time has passed that we can be confident that 07f32fcd23a
resolved the issue. Therefore we can remove the temporary debugging
aids.

Author: Andres Freund <andres@anarazel.de>
Discussion: https://postgr.es/m/E1k7tGP-0005V0-5k@gemulon.postgresql.org
---

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 8eb276e464..9b5f417eac 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -6048,16 +6048,7 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,
 				TransactionIdIsInProgress(members[i].xid))
 			{
 				/* running locker cannot possibly be older than the cutoff */
-				if (TransactionIdPrecedes(members[i].xid, cutoff_xid))
-				{
-					/* temporary on-bf debugging */
-					elog(PANIC, "too old alive locker: multi: %u, member xid: %u, memb-current: %d, memb-progress: %d, cutoff: %u, cutoff-multi: %u, relfrozenxid: %u, relminmxid: %u",
-						 multi, members[i].xid,
-						 TransactionIdIsCurrentTransactionId(members[i].xid),
-						 TransactionIdIsInProgress(members[i].xid),
-						 cutoff_xid, cutoff_multi,
-						 relfrozenxid, relminmxid);
-				}
+				Assert(!TransactionIdPrecedes(members[i].xid, cutoff_xid));
 				newmembers[nnewmembers++] = members[i];
 				has_lockers = true;
 			}
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
index 03c8e1ff7e..44e2224dd5 100644
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@ -1350,14 +1350,7 @@ lazy_scan_heap(Relation onerel, VacuumParams *params, LVRelStats *vacrelstats,
 					if (HeapTupleIsHotUpdated(&tuple) ||
 						HeapTupleIsHeapOnly(&tuple) ||
 						params->index_cleanup == VACOPT_TERNARY_DISABLED)
-					{
-						/* temporary on-bf debugging */
-						elog(LOG, "treating dead HOT tuple (updated %d, heap only: %d, index cleanup: %d) as alive",
-							 HeapTupleIsHotUpdated(&tuple), HeapTupleIsHeapOnly(&tuple),
-							 params->index_cleanup == VACOPT_TERNARY_DISABLED);
-
 						nkeep += 1;
-					}
 					else
 						tupgone = true; /* we can delete the tuple */
 					all_visible = false;