NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitaea1f24

committed

recoveryStopsHere() must check the resource manager ID.

Before commitc016ce7, this wasn'tneeded, but now that multiple resource manager IDs can percolate downthrough here, we have to make sure we know which one we've got.Otherwise, we can confuse (for example) an XLOG_XACT_COMMIT recordwith an XLOG_CHECKPOINT_SHUTDOWN record.Review by Jaime Casanova

1 parentc29abc8 commitaea1f24Copy full SHA for aea1f24

File tree

1 file changed

-3

lines changed

src/backend/access/transam
- xlog.c

1 file changed

-3

lines changed

`‎src/backend/access/transam/xlog.c`

Lines changed: 3 additions & 3 deletions

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`		`-elseif (record_info==XLOG_XACT_ABORT)`
	`5593`	`+elseif (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`		`-elseif (record_info==XLOG_RESTORE_POINT)`
	`5600`	`+elseif (record->xl_rmid==RM_XLOG_ID&&record_info==XLOG_RESTORE_POINT)`
`5601`	`5601`	`{`
`5602`	`5602`	`xl_restore_point*recordRestorePointData;`
`5603`	`5603`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitaea1f24

File tree

1 file changed

1 file changed

`‎src/backend/access/transam/xlog.c`

0 commit comments