cleanup 2

kelvich · kelvich · commit d906905cebfa · 2016-12-15T15:17:19.000+03:00
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -219,22 +219,18 @@ StandbyCheckPointTwoPhase(XLogRecPtr redo_horizon)
 
 	// Assert(RecoveryInProgress());
 
-	elog(WARNING, "StandbyCheckPointTwoPhase");
-
 	TRACE_POSTGRESQL_TWOPHASE_CHECKPOINT_START();
 
 	dlist_foreach_modify(miter, &StandbyTwoPhaseStateData)
 	{
 		StandbyPreparedTransaction   *xact = dlist_container(StandbyPreparedTransaction,
 															list_node, miter.cur);
 
-		if (redo_horizon == 0 || xact->prepare_end_lsn <= redo_horizon)
-		// if (true)
+		if (redo_horizon == InvalidXLogRecPtr || xact->prepare_end_lsn <= redo_horizon)
 		{
 			char	   *buf;
 			int			len;
 
-			fprintf(stderr, "2PC: checkpoint: %x --> %d (horizon: %x)\n", xact->prepare_start_lsn, xact->xid, redo_horizon);
 			XlogReadTwoPhaseData(xact->prepare_start_lsn, &buf, &len);
 			RecreateTwoPhaseFile(xact->xid, buf, len);
 			pfree(buf);
@@ -270,8 +266,6 @@ StandbyAtCommit(TransactionId xid)
 
 		if (xact->xid == xid)
 		{
-			// pfree(xact);
-			fprintf(stderr, "2PC: commit: %x/%d\n", xact->prepare_start_lsn, xact->xid);
 			dlist_delete(miter.cur);
 			return;
 		}
@@ -1746,8 +1740,6 @@ StandbyAtPrepare(XLogReaderState *record)
 	xact->prepare_start_lsn = record->ReadRecPtr;
 	xact->prepare_end_lsn = record->EndRecPtr;
 
-	fprintf(stderr, "2PC: at_prepare: %x/%d\n", xact->prepare_start_lsn, xact->xid);
-
 	dlist_push_tail(&StandbyTwoPhaseStateData, &xact->list_node);
 }
 
@@ -1789,7 +1781,6 @@ PrescanPreparedTransactions(TransactionId **xids_p, int *nxids_p)
 	int			nxids = 0;
 	int			allocsize = 0;
 
-	fprintf(stderr, "--- PrescanPreparedTransactions\n");
 	StandbyCheckPointTwoPhase(0);
 
 	cldir = AllocateDir(TWOPHASE_DIR);
@@ -1928,8 +1919,6 @@ StandbyRecoverPreparedTransactions(bool overwriteOK)
 	DIR		   *cldir;
 	struct dirent *clde;
 
-	fprintf(stderr, "--- StandbyRecoverPreparedTransactions\n");
-
 	cldir = AllocateDir(TWOPHASE_DIR);
 	while ((clde = ReadDir(cldir, TWOPHASE_DIR)) != NULL)
 	{
@@ -2013,8 +2002,6 @@ RecoverPreparedTransactions(void)
 	struct dirent *clde;
 	bool		overwriteOK = false;
 
-	fprintf(stderr, "--- RecoverPreparedTransactions\n");
-
 	snprintf(dir, MAXPGPATH, "%s", TWOPHASE_DIR);
 
 	cldir = AllocateDir(dir);
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -5604,7 +5604,6 @@ xact_redo(XLogReaderState *record)
 			Assert(TransactionIdIsValid(parsed.twophase_xid));
 			xact_redo_commit(&parsed, parsed.twophase_xid,
 							 record->EndRecPtr, XLogRecGetOrigin(record));
-			// RemoveTwoPhaseFile(parsed.twophase_xid, false);
 			StandbyAtCommit(parsed.twophase_xid);
 		}
 	}
@@ -5625,17 +5624,12 @@ xact_redo(XLogReaderState *record)
 		{
 			Assert(TransactionIdIsValid(parsed.twophase_xid));
 			xact_redo_abort(&parsed, parsed.twophase_xid);
-			// RemoveTwoPhaseFile(parsed.twophase_xid, false);
 			StandbyAtCommit(parsed.twophase_xid);
 		}
 	}
 	else if (info == XLOG_XACT_PREPARE)
 	{
 		/* the record contents are exactly the 2PC file */
-		// elog(WARNING, "2PC: RecreateTwoPhaseFile");
-		// RecreateTwoPhaseFile(XLogRecGetXid(record),
-		// 				  XLogRecGetData(record), XLogRecGetDataLen(record));
-		elog(WARNING, "reading prepared tx");
 		StandbyAtPrepare(record);
 	}
 	else if (info == XLOG_XACT_ASSIGNMENT)
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -6709,7 +6709,6 @@ StartupXLOG(void)
 
 				ProcArrayApplyRecoveryInfo(&running);
 
-				StandbyCheckPointTwoPhase(0);
 				StandbyRecoverPreparedTransactions(false);
 			}
 		}
@@ -8718,7 +8717,6 @@ CreateEndOfRecoveryRecord(void)
 	END_CRIT_SECTION();
 
 	LocalXLogInsertAllowed = -1;	/* return to "check" state */
-	// StandbyCheckPointTwoPhase(0);
 }
 
 /*
@@ -8742,7 +8740,6 @@ CheckPointGuts(XLogRecPtr checkPointRedo, int flags)
 	CheckPointBuffers(flags);	/* performs all required fsyncs */
 	CheckPointReplicationOrigin();
 	/* We deliberately delay 2PC checkpointing as long as possible */
-	StandbyCheckPointTwoPhase(checkPointRedo);
 	CheckPointTwoPhase(checkPointRedo);
 }
 
@@ -9339,7 +9336,6 @@ xlog_redo(XLogReaderState *record)
 	Assert(info == XLOG_FPI || info == XLOG_FPI_FOR_HINT ||
 		   !XLogRecHasAnyBlockRefs(record));
 
-	elog(WARNING, "2PC: xlog_redo, info=%x", info);
 	if (info == XLOG_NEXTOID)
 	{
 		Oid			nextOid;
@@ -9423,8 +9419,6 @@ xlog_redo(XLogReaderState *record)
 
 			ProcArrayApplyRecoveryInfo(&running);
 
-			fprintf(stderr, "--- aaa\n");
-			StandbyCheckPointTwoPhase(0);
 			StandbyRecoverPreparedTransactions(true);
 		}
 
@@ -9517,7 +9511,6 @@ xlog_redo(XLogReaderState *record)
 			ereport(PANIC,
 					(errmsg("unexpected timeline ID %u (should be %u) in checkpoint record",
 							xlrec.ThisTimeLineID, ThisTimeLineID)));
-		// StandbyCheckPointTwoPhase(0);
 	}
 	else if (info == XLOG_NOOP)
 	{

Original file line number	Diff line number	Diff line change
`@@ -5604,7 +5604,6 @@ xact_redo(XLogReaderState *record)`
`5604`	`5604`	`Assert(TransactionIdIsValid(parsed.twophase_xid));`
`5605`	`5605`	`xact_redo_commit(&parsed, parsed.twophase_xid,`
`5606`	`5606`	`record->EndRecPtr, XLogRecGetOrigin(record));`
`5607`		`- // RemoveTwoPhaseFile(parsed.twophase_xid, false);`
`5608`	`5607`	`StandbyAtCommit(parsed.twophase_xid);`
`5609`	`5608`	`}`
`5610`	`5609`	`}`
`@@ -5625,17 +5624,12 @@ xact_redo(XLogReaderState *record)`
`5625`	`5624`	`{`
`5626`	`5625`	`Assert(TransactionIdIsValid(parsed.twophase_xid));`
`5627`	`5626`	`xact_redo_abort(&parsed, parsed.twophase_xid);`
`5628`		`- // RemoveTwoPhaseFile(parsed.twophase_xid, false);`
`5629`	`5627`	`StandbyAtCommit(parsed.twophase_xid);`
`5630`	`5628`	`}`
`5631`	`5629`	`}`
`5632`	`5630`	`else if (info == XLOG_XACT_PREPARE)`
`5633`	`5631`	`{`
`5634`	`5632`	`/* the record contents are exactly the 2PC file */`
`5635`		`- // elog(WARNING, "2PC: RecreateTwoPhaseFile");`
`5636`		`- // RecreateTwoPhaseFile(XLogRecGetXid(record),`
`5637`		`- // XLogRecGetData(record), XLogRecGetDataLen(record));`
`5638`		`- elog(WARNING, "reading prepared tx");`
`5639`	`5633`	`StandbyAtPrepare(record);`
`5640`	`5634`	`}`
`5641`	`5635`	`else if (info == XLOG_XACT_ASSIGNMENT)`
Original file line number	Diff line number	Diff line change
`@@ -6709,7 +6709,6 @@ StartupXLOG(void)`
`6709`	`6709`
`6710`	`6710`	`ProcArrayApplyRecoveryInfo(&running);`
`6711`	`6711`
`6712`		`- StandbyCheckPointTwoPhase(0);`
`6713`	`6712`	`StandbyRecoverPreparedTransactions(false);`
`6714`	`6713`	`}`
`6715`	`6714`	`}`
`@@ -8718,7 +8717,6 @@ CreateEndOfRecoveryRecord(void)`
`8718`	`8717`	`END_CRIT_SECTION();`
`8719`	`8718`
`8720`	`8719`	`LocalXLogInsertAllowed = -1; /* return to "check" state */`
`8721`		`- // StandbyCheckPointTwoPhase(0);`
`8722`	`8720`	`}`
`8723`	`8721`
`8724`	`8722`	`/*`
`@@ -8742,7 +8740,6 @@ CheckPointGuts(XLogRecPtr checkPointRedo, int flags)`
`8742`	`8740`	`CheckPointBuffers(flags); /* performs all required fsyncs */`
`8743`	`8741`	`CheckPointReplicationOrigin();`
`8744`	`8742`	`/* We deliberately delay 2PC checkpointing as long as possible */`
`8745`		`- StandbyCheckPointTwoPhase(checkPointRedo);`
`8746`	`8743`	`CheckPointTwoPhase(checkPointRedo);`
`8747`	`8744`	`}`
`8748`	`8745`
`@@ -9339,7 +9336,6 @@ xlog_redo(XLogReaderState *record)`
`9339`	`9336`	`Assert(info == XLOG_FPI \|\| info == XLOG_FPI_FOR_HINT \|\|`
`9340`	`9337`	`!XLogRecHasAnyBlockRefs(record));`
`9341`	`9338`
`9342`		`- elog(WARNING, "2PC: xlog_redo, info=%x", info);`
`9343`	`9339`	`if (info == XLOG_NEXTOID)`
`9344`	`9340`	`{`
`9345`	`9341`	`Oid nextOid;`
`@@ -9423,8 +9419,6 @@ xlog_redo(XLogReaderState *record)`
`9423`	`9419`
`9424`	`9420`	`ProcArrayApplyRecoveryInfo(&running);`
`9425`	`9421`
`9426`		`- fprintf(stderr, "--- aaa\n");`
`9427`		`- StandbyCheckPointTwoPhase(0);`
`9428`	`9422`	`StandbyRecoverPreparedTransactions(true);`
`9429`	`9423`	`}`
`9430`	`9424`
`@@ -9517,7 +9511,6 @@ xlog_redo(XLogReaderState *record)`
`9517`	`9511`	`ereport(PANIC,`
`9518`	`9512`	`(errmsg("unexpected timeline ID %u (should be %u) in checkpoint record",`
`9519`	`9513`	`xlrec.ThisTimeLineID, ThisTimeLineID)));`
`9520`		`- // StandbyCheckPointTwoPhase(0);`
`9521`	`9514`	`}`
`9522`	`9515`	`else if (info == XLOG_NOOP)`
`9523`	`9516`	`{`