dirty, but working version

kelvich · kelvich · commit e9670e7ac142 · 2016-12-14T18:57:19.000+03:00
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -217,7 +217,9 @@ StandbyCheckPointTwoPhase(XLogRecPtr redo_horizon)
 	dlist_mutable_iter miter;
 	int			serialized_xacts = 0;
 
-	Assert(RecoveryInProgress());
+	// Assert(RecoveryInProgress());
+
+	elog(WARNING, "StandbyCheckPointTwoPhase");
 
 	TRACE_POSTGRESQL_TWOPHASE_CHECKPOINT_START();
 
@@ -226,11 +228,13 @@ StandbyCheckPointTwoPhase(XLogRecPtr redo_horizon)
 		StandbyPreparedTransaction   *xact = dlist_container(StandbyPreparedTransaction,
 															list_node, miter.cur);
 
-		if (xact->prepare_end_lsn <= redo_horizon)
+		if (redo_horizon == 0 || xact->prepare_end_lsn <= redo_horizon)
+		// if (true)
 		{
 			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);
@@ -267,6 +271,7 @@ 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;
 		}
@@ -1741,6 +1746,8 @@ 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);
 }
 
@@ -1782,6 +1789,9 @@ PrescanPreparedTransactions(TransactionId **xids_p, int *nxids_p)
 	int			nxids = 0;
 	int			allocsize = 0;
 
+	fprintf(stderr, "--- PrescanPreparedTransactions\n");
+	StandbyCheckPointTwoPhase(0);
+
 	cldir = AllocateDir(TWOPHASE_DIR);
 	while ((clde = ReadDir(cldir, TWOPHASE_DIR)) != NULL)
 	{
@@ -1918,6 +1928,8 @@ StandbyRecoverPreparedTransactions(bool overwriteOK)
 	DIR		   *cldir;
 	struct dirent *clde;
 
+	fprintf(stderr, "--- StandbyRecoverPreparedTransactions\n");
+
 	cldir = AllocateDir(TWOPHASE_DIR);
 	while ((clde = ReadDir(cldir, TWOPHASE_DIR)) != NULL)
 	{
@@ -2001,6 +2013,8 @@ 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
@@ -5635,6 +5635,7 @@ xact_redo(XLogReaderState *record)
 		// 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,6 +6709,7 @@ StartupXLOG(void)
 
 				ProcArrayApplyRecoveryInfo(&running);
 
+				StandbyCheckPointTwoPhase(0);
 				StandbyRecoverPreparedTransactions(false);
 			}
 		}
@@ -8717,6 +8718,7 @@ CreateEndOfRecoveryRecord(void)
 	END_CRIT_SECTION();
 
 	LocalXLogInsertAllowed = -1;	/* return to "check" state */
+	// StandbyCheckPointTwoPhase(0);
 }
 
 /*
@@ -8740,6 +8742,7 @@ 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);
 }
 
@@ -9420,6 +9423,8 @@ xlog_redo(XLogReaderState *record)
 
 			ProcArrayApplyRecoveryInfo(&running);
 
+			fprintf(stderr, "--- aaa\n");
+			StandbyCheckPointTwoPhase(0);
 			StandbyRecoverPreparedTransactions(true);
 		}
 
@@ -9512,6 +9517,7 @@ 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)
 	{
diff --git a/src/test/recovery/t/000_twophase.pl b/src/test/recovery/t/000_twophase.pl
@@ -10,6 +10,7 @@
 $node_master->init(allows_streaming => 1);
 $node_master->append_conf('postgresql.conf', qq(
 	max_prepared_transactions = 10
+	log_checkpoints = true
 ));
 $node_master->start;
 $node_master->backup('master_backup');
@@ -311,4 +312,4 @@
 
 $node_master->psql('postgres', "select count(*) from t",
 	  stdout => \$psql_out);
-is($psql_out, '6', "Check nextXid handling for prepared subtransactions");
+is($psql_out, '6', "Check nextXid handling for prepared subtransactions");

Original file line number	Diff line number	Diff line change
`@@ -5635,6 +5635,7 @@ xact_redo(XLogReaderState *record)`
`5635`	`5635`	`// elog(WARNING, "2PC: RecreateTwoPhaseFile");`
`5636`	`5636`	`// RecreateTwoPhaseFile(XLogRecGetXid(record),`
`5637`	`5637`	`// XLogRecGetData(record), XLogRecGetDataLen(record));`
	`5638`	`+ elog(WARNING, "reading prepared tx");`
`5638`	`5639`	`StandbyAtPrepare(record);`
`5639`	`5640`	`}`
`5640`	`5641`	`else if (info == XLOG_XACT_ASSIGNMENT)`
Original file line number	Diff line number	Diff line change
`@@ -6709,6 +6709,7 @@ StartupXLOG(void)`
`6709`	`6709`
`6710`	`6710`	`ProcArrayApplyRecoveryInfo(&running);`
`6711`	`6711`
	`6712`	`+ StandbyCheckPointTwoPhase(0);`
`6712`	`6713`	`StandbyRecoverPreparedTransactions(false);`
`6713`	`6714`	`}`
`6714`	`6715`	`}`
`@@ -8717,6 +8718,7 @@ CreateEndOfRecoveryRecord(void)`
`8717`	`8718`	`END_CRIT_SECTION();`
`8718`	`8719`
`8719`	`8720`	`LocalXLogInsertAllowed = -1; /* return to "check" state */`
	`8721`	`+ // StandbyCheckPointTwoPhase(0);`
`8720`	`8722`	`}`
`8721`	`8723`
`8722`	`8724`	`/*`
`@@ -8740,6 +8742,7 @@ CheckPointGuts(XLogRecPtr checkPointRedo, int flags)`
`8740`	`8742`	`CheckPointBuffers(flags); /* performs all required fsyncs */`
`8741`	`8743`	`CheckPointReplicationOrigin();`
`8742`	`8744`	`/* We deliberately delay 2PC checkpointing as long as possible */`
	`8745`	`+ StandbyCheckPointTwoPhase(checkPointRedo);`
`8743`	`8746`	`CheckPointTwoPhase(checkPointRedo);`
`8744`	`8747`	`}`
`8745`	`8748`
`@@ -9420,6 +9423,8 @@ xlog_redo(XLogReaderState *record)`
`9420`	`9423`
`9421`	`9424`	`ProcArrayApplyRecoveryInfo(&running);`
`9422`	`9425`
	`9426`	`+ fprintf(stderr, "--- aaa\n");`
	`9427`	`+ StandbyCheckPointTwoPhase(0);`
`9423`	`9428`	`StandbyRecoverPreparedTransactions(true);`
`9424`	`9429`	`}`
`9425`	`9430`
`@@ -9512,6 +9517,7 @@ xlog_redo(XLogReaderState *record)`
`9512`	`9517`	`ereport(PANIC,`
`9513`	`9518`	`(errmsg("unexpected timeline ID %u (should be %u) in checkpoint record",`
`9514`	`9519`	`xlrec.ThisTimeLineID, ThisTimeLineID)));`
	`9520`	`+ // StandbyCheckPointTwoPhase(0);`
`9515`	`9521`	`}`
`9516`	`9522`	`else if (info == XLOG_NOOP)`
`9517`	`9523`	`{`