database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Treat 2PC commit/abort the same as regular xacts in recovery.

Browse Source 
There were several oversights in recovery code where COMMIT/ABORT PREPARED
records were ignored:

* pg_last_xact_replay_timestamp() (wasn't updated for 2PC commits)
* recovery_min_apply_delay (2PC commits were applied immediately)
* recovery_target_xid (recovery would not stop if the XID used 2PC)

The first of those was reported by Sergiy Zuban in bug #11032, analyzed by
Tom Lane and Andres Freund. The bug was always there, but was masked before
commit d19bd29f07aef9e508ff047d128a4046cc8bc1e2, because COMMIT PREPARED
always created an extra regular transaction that was WAL-logged.

Backpatch to all supported versions (older versions didn't have all the
features and therefore didn't have all of the above bugs).
This commit is contained in:
Heikki Linnakangas 2014-07-29 10:33:15 +03:00
parent af9d51624e
commit 1578d13dc7
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/backend/access/transam/xlog.c
View File

@ -5880,6 +5880,7 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
bool stopsHere; bool stopsHere;
uint8 record_info; uint8 record_info;
TimestampTz recordXtime; TimestampTz recordXtime;
TransactionId recordXid;
char recordRPName[MAXFNAMELEN]; char recordRPName[MAXFNAMELEN];
/* We only consider stopping at COMMIT, ABORT or RESTORE POINT records */ /* We only consider stopping at COMMIT, ABORT or RESTORE POINT records */
@ -5892,6 +5893,7 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
recordXactCommitData = (xl_xact_commit_compact *) XLogRecGetData(record); recordXactCommitData = (xl_xact_commit_compact *) XLogRecGetData(record);
recordXtime = recordXactCommitData->xact_time; recordXtime = recordXactCommitData->xact_time;
recordXid = record->xl_xid;
} }
else if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_COMMIT) else if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_COMMIT)
{ {
@ -5899,6 +5901,15 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
recordXactCommitData = (xl_xact_commit *) XLogRecGetData(record); recordXactCommitData = (xl_xact_commit *) XLogRecGetData(record);
recordXtime = recordXactCommitData->xact_time; recordXtime = recordXactCommitData->xact_time;
recordXid = record->xl_xid;
}
else if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_COMMIT_PREPARED)
{
xl_xact_commit_prepared *recordXactCommitData;
recordXactCommitData = (xl_xact_commit_prepared *) XLogRecGetData(record);
recordXtime = recordXactCommitData->crec.xact_time;
recordXid = recordXactCommitData->xid;
} }
else if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_ABORT) else if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_ABORT)
{ {
@ -5906,6 +5917,15 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
recordXactAbortData = (xl_xact_abort *) XLogRecGetData(record); recordXactAbortData = (xl_xact_abort *) XLogRecGetData(record);
recordXtime = recordXactAbortData->xact_time; recordXtime = recordXactAbortData->xact_time;
recordXid = record->xl_xid;
}
else if (record->xl_rmid == RM_XACT_ID && record_info == XLOG_XACT_ABORT_PREPARED)
{
xl_xact_abort_prepared *recordXactAbortData;
recordXactAbortData = (xl_xact_abort_prepared *) XLogRecGetData(record);
recordXtime = recordXactAbortData->arec.xact_time;
recordXid = recordXactAbortData->xid;
} }
else if (record->xl_rmid == RM_XLOG_ID && record_info == XLOG_RESTORE_POINT) else if (record->xl_rmid == RM_XLOG_ID && record_info == XLOG_RESTORE_POINT)
{ {
@ -5913,6 +5933,7 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
recordRestorePointData = (xl_restore_point *) XLogRecGetData(record); recordRestorePointData = (xl_restore_point *) XLogRecGetData(record);
recordXtime = recordRestorePointData->rp_time; recordXtime = recordRestorePointData->rp_time;
recordXid = InvalidTransactionId;
strlcpy(recordRPName, recordRestorePointData->rp_name, MAXFNAMELEN); strlcpy(recordRPName, recordRestorePointData->rp_name, MAXFNAMELEN);
} }
else else
@ -5941,7 +5962,7 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
* they complete. A higher numbered xid will complete before you about * they complete. A higher numbered xid will complete before you about
* 50% of the time... * 50% of the time...
*/ */
stopsHere = (record->xl_xid == recoveryTargetXid); stopsHere = (recordXid == recoveryTargetXid);
if (stopsHere) if (stopsHere)
*includeThis = recoveryTargetInclusive; *includeThis = recoveryTargetInclusive;
} }
@ -5976,11 +5997,13 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
if (stopsHere) if (stopsHere)
{ {
recoveryStopXid = record->xl_xid; recoveryStopXid = recordXid;
recoveryStopTime = recordXtime; recoveryStopTime = recordXtime;
recoveryStopAfter = *includeThis; recoveryStopAfter = *includeThis;
if (record_info == XLOG_XACT_COMMIT_COMPACT || record_info == XLOG_XACT_COMMIT) if (record_info == XLOG_XACT_COMMIT_COMPACT ||
record_info == XLOG_XACT_COMMIT ||
record_info == XLOG_XACT_COMMIT_PREPARED)
{ {
if (recoveryStopAfter) if (recoveryStopAfter)
ereport(LOG, ereport(LOG,
@ -5993,7 +6016,8 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
recoveryStopXid, recoveryStopXid,
timestamptz_to_str(recoveryStopTime)))); timestamptz_to_str(recoveryStopTime))));
} }
else if (record_info == XLOG_XACT_ABORT) else if (record_info == XLOG_XACT_ABORT ||
record_info == XLOG_XACT_ABORT_PREPARED)
{ {
if (recoveryStopAfter) if (recoveryStopAfter)
ereport(LOG, ereport(LOG,

3
src/include/access/xact.h
View File

@ -177,8 +177,7 @@ typedef struct xl_xact_abort
/* /*
* COMMIT_PREPARED and ABORT_PREPARED are identical to COMMIT/ABORT records * COMMIT_PREPARED and ABORT_PREPARED are identical to COMMIT/ABORT records
* except that we have to store the XID of the prepared transaction explicitly * except that we have to store the XID of the prepared transaction explicitly
* --- the XID in the record header will be for the transaction doing the * --- the XID in the record header will be invalid.
* COMMIT PREPARED or ABORT PREPARED command.
*/ */
typedef struct xl_xact_commit_prepared typedef struct xl_xact_commit_prepared