NotificationsYou must be signed in to change notification settings
Fork86
Star739

Commitffc8566

committed

[PBCKP-428] read_recovery_info don't need XRecOffIsValid(stop_lsn)

since it uses XLogFindNextRecord, it could use stop_lsn with no validoffset. In fact, it uses truncated stop_lsn with invalid offset always.Also fix getting timestamp from possible record in a future.We could not to not enter the loop since we need record->xl_prev tocorrectly walk backward. So we need to add condition beforegetRecordTimestamp.

1 parent12b8bfb commitffc8566Copy full SHA for ffc8566

File tree

1 file changed

-8

lines changed

src
- parsexlog.c

1 file changed

-8

lines changed

`‎src/parsexlog.c`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -540,10 +540,6 @@ read_recovery_info(const char *archivedir, TimeLineID tli, uint32 wal_seg_size,`
`540`	`540`	`elog(ERROR,"Invalid start_lsn value %X/%X",`
`541`	`541`	`(uint32) (start_lsn >>32), (uint32) (start_lsn));`
`542`	`542`
`543`		`-if (!XRecOffIsValid(stop_lsn))`
`544`		`-elog(ERROR,"Invalid stop_lsn value %X/%X",`
`545`		`- (uint32) (stop_lsn >>32), (uint32) (stop_lsn));`
`546`		`-`
`547`	`543`	`xlogreader=InitXLogPageRead(&reader_data,archivedir,tli,wal_seg_size,`
`548`	`544`	`false, true, true);`
`549`	`545`
`@@ -581,16 +577,16 @@ read_recovery_info(const char *archivedir, TimeLineID tli, uint32 wal_seg_size,`
`581`	`577`	`(uint32) (errptr >>32), (uint32) (errptr));`
`582`	`578`	`}`
`583`	`579`
`584`		`-/* for compatibility with Pg < 13 */`
`585`		`-curpoint=InvalidXLogRecPtr;`
`586`		`-`
`587`		`-if (getRecordTimestamp(xlogreader,&last_time))`
	`580`	`+if (curpoint<endpoint&&getRecordTimestamp(xlogreader,&last_time))`
`588`	`581`	`{`
`589`	`582`	`*recovery_time=timestamptz_to_time_t(last_time);`
`590`	`583`
`591`	`584`	`/* Found timestamp in WAL record 'record' */`
`592`	`585`	`res= true;`
`593`	`586`	`}`
	`587`	`+`
	`588`	`+/* for compatibility with Pg < 13 */`
	`589`	`+curpoint=InvalidXLogRecPtr;`
`594`	`590`	`}while (xlogreader->EndRecPtr<endpoint);`
`595`	`591`
`596`	`592`	`if (res)`

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!

Commitffc8566

File tree

1 file changed

1 file changed

`‎src/parsexlog.c`

0 commit comments