c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix single-record reads to use restore_command if available in pg_rewind

Browse source 
readOneRecord() is used now when looking for a checkpoint record to
check if the target server is an ancestor of the source across multiple
timelines, and using a restore_command if available improves the
stability of the operation.  This part was missed in a7e8ece.

Reported-by: Kyotaro Horiguchi
Discussion: https://postgr.es/m/20200421.150830.1410714948345179794.horikyota.ntt@gmail.com
This commit is contained in:
Michael Paquier 2020-04-22 08:08:28 +09:00
parent c33869cc3b
commit cd12323440
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bin/pg_rewind/parsexlog.c
View file

@ -106,7 +106,8 @@ extractPageMap(const char *datadir, XLogRecPtr startpoint, int tliIndex,
* doing anything with the record itself. * doing anything with the record itself.
*/ */
XLogRecPtr XLogRecPtr
readOneRecord(const char *datadir, XLogRecPtr ptr, int tliIndex) readOneRecord(const char *datadir, XLogRecPtr ptr, int tliIndex,
const char *restoreCommand)
{ {
XLogRecord *record; XLogRecord *record;
XLogReaderState *xlogreader; XLogReaderState *xlogreader;
@ -115,6 +116,7 @@ readOneRecord(const char *datadir, XLogRecPtr ptr, int tliIndex)
XLogRecPtr endptr; XLogRecPtr endptr;
private.tliIndex = tliIndex; private.tliIndex = tliIndex;
private.restoreCommand = restoreCommand;
xlogreader = XLogReaderAllocate(WalSegSz, datadir, &SimpleXLogPageRead, xlogreader = XLogReaderAllocate(WalSegSz, datadir, &SimpleXLogPageRead,
&private); &private);
if (xlogreader == NULL) if (xlogreader == NULL)

3
src/bin/pg_rewind/pg_rewind.c
View file

@ -339,7 +339,8 @@ main(int argc, char **argv)
/* Read the checkpoint record on the target to see where it ends. */ /* Read the checkpoint record on the target to see where it ends. */
chkptendrec = readOneRecord(datadir_target, chkptendrec = readOneRecord(datadir_target,
ControlFile_target.checkPoint, ControlFile_target.checkPoint,
targetNentries - 1); targetNentries - 1,
restore_command);
/* /*
* If the histories diverged exactly at the end of the shutdown * If the histories diverged exactly at the end of the shutdown

2
src/bin/pg_rewind/pg_rewind.h
View file

@ -50,7 +50,7 @@ extern void findLastCheckpoint(const char *datadir, XLogRecPtr searchptr,
XLogRecPtr *lastchkptredo, XLogRecPtr *lastchkptredo,
const char *restoreCommand); const char *restoreCommand);
extern XLogRecPtr readOneRecord(const char *datadir, XLogRecPtr ptr, extern XLogRecPtr readOneRecord(const char *datadir, XLogRecPtr ptr,
int tliIndex); int tliIndex, const char *restoreCommand);
/* in pg_rewind.c */ /* in pg_rewind.c */
extern void progress_report(bool force); extern void progress_report(bool force);