recoveryStopsHere() must check the resource manager ID.

robertmhaas · robertmhaas · commit aea1f24c2c25 · 2011-04-18T08:27:19.000-04:00
Before commit c016ce7, this wasn't needed, but now that multiple resource manager IDs can percolate down through here, we have to make sure we know which one we've got. Otherwise, we can confuse (for example) an XLOG_XACT_COMMIT record with an XLOG_CHECKPOINT_SHUTDOWN record. Review by Jaime Casanova
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -5583,21 +5583,21 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
 	if (record->xl_rmid != RM_XACT_ID && record->xl_rmid != RM_XLOG_ID)
 		return false;
 	record_info = record->xl_info & ~XLR_INFO_MASK;
-	if (record_info == XLOG_XACT_COMMIT)
+	if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_COMMIT)
 	{
 		xl_xact_commit *recordXactCommitData;
 
 		recordXactCommitData = (xl_xact_commit *) XLogRecGetData(record);
 		recordXtime = recordXactCommitData->xact_time;
 	}
-	else if (record_info == XLOG_XACT_ABORT)
+	else if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_ABORT)
 	{
 		xl_xact_abort *recordXactAbortData;
 
 		recordXactAbortData = (xl_xact_abort *) XLogRecGetData(record);
 		recordXtime = recordXactAbortData->xact_time;
 	}
-	else if (record_info == XLOG_RESTORE_POINT)
+	else if (record->xl_rmid == RM_XLOG_ID && record_info == XLOG_RESTORE_POINT)
 	{
 		xl_restore_point *recordRestorePointData;
 

Original file line number	Diff line number	Diff line change
`@@ -5583,21 +5583,21 @@ recoveryStopsHere(XLogRecord record, bool includeThis)`
`5583`	`5583`	`if (record->xl_rmid != RM_XACT_ID && record->xl_rmid != RM_XLOG_ID)`
`5584`	`5584`	`return false;`
`5585`	`5585`	`record_info = record->xl_info & ~XLR_INFO_MASK;`
`5586`		`- if (record_info == XLOG_XACT_COMMIT)`
	`5586`	`+ if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_COMMIT)`
`5587`	`5587`	`{`
`5588`	`5588`	`xl_xact_commit *recordXactCommitData;`
`5589`	`5589`
`5590`	`5590`	`recordXactCommitData = (xl_xact_commit *) XLogRecGetData(record);`
`5591`	`5591`	`recordXtime = recordXactCommitData->xact_time;`
`5592`	`5592`	`}`
`5593`		`- else if (record_info == XLOG_XACT_ABORT)`
	`5593`	`+ else if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_ABORT)`
`5594`	`5594`	`{`
`5595`	`5595`	`xl_xact_abort *recordXactAbortData;`
`5596`	`5596`
`5597`	`5597`	`recordXactAbortData = (xl_xact_abort *) XLogRecGetData(record);`
`5598`	`5598`	`recordXtime = recordXactAbortData->xact_time;`
`5599`	`5599`	`}`
`5600`		`- else if (record_info == XLOG_RESTORE_POINT)`
	`5600`	`+ else if (record->xl_rmid == RM_XLOG_ID && record_info == XLOG_RESTORE_POINT)`
`5601`	`5601`	`{`
`5602`	`5602`	`xl_restore_point *recordRestorePointData;`
`5603`	`5603`