NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit1865fb6

committed

Add missing ControlFile.checkPointCopy.ThisTimeLineID line for 'guess'

pg_resetxlog.Simon

1 parent0a646e8 commit1865fb6Copy full SHA for 1865fb6

File tree

1 file changed

+15

-10

lines changed

src/bin/pg_resetxlog
- pg_resetxlog.c

1 file changed

+15

-10

lines changed

`‎src/bin/pg_resetxlog/pg_resetxlog.c‎`

Lines changed: 15 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ RestoreControlValues(int mode)`
`565`	`565`	`{`
`566`	`566`	`structtimevaltv;`
`567`	`567`	`char*localeptr;`
`568`		`-boolsuccessed=true;`
	`568`	`+boolsuccessed=true;`
`569`	`569`
`570`	`570`	`/*`
`571`	`571`	`* Set up a completely default set of pg_control values.`
`@@ -579,27 +579,30 @@ RestoreControlValues(int mode)`
`579`	`579`	`* update the checkpoint value in control file,by searching`
`580`	`580`	`* xlog segment file, or just guessing it.`
`581`	`581`	`*/`
`582`		`-if (mode==WAL)`
`583`		`-{`
	`582`	`+if (mode==WAL)`
	`583`	`+{`
`584`	`584`	`intresult=SearchLastCheckpoint();`
`585`		`-if (result>0 )/* The last checkpoint had been found. */`
	`585`	`+`
	`586`	`+if (result>0)/* The last checkpoint had been found. */`
`586`	`587`	`{`
`587`	`588`	`ControlFile.checkPointCopy=lastcheckpoint;`
	`589`	`+ControlFile.checkPointCopy.ThisTimeLineID=LastXLogFile->tli;`
`588`	`590`	`ControlFile.checkPoint=lastchkp;`
`589`	`591`	`ControlFile.prevCheckPoint=prevchkp;`
	`592`	`+`
`590`	`593`	`ControlFile.logId=LastXLogFile->logid;`
`591`	`594`	`ControlFile.logSeg=LastXLogFile->seg+1;`
`592`		`-ControlFile.checkPointCopy.ThisTimeLineID=LastXLogFile->tli;`
`593`	`595`	`ControlFile.state=state;`
`594`		`-}elsesuccessed= false;`
	`596`	`+}`
	`597`	`+else`
	`598`	`+successed= false;`
`595`	`599`
`596`	`600`	`/* Clean up the list. */`
`597`	`601`	`CleanUpList(xlogfilelist);`
`598`		`-`
`599`		`- }`
`600`		`-`
`601`		`-if (mode==GUESS)`
	`602`	`+}`
	`603`	`+else/* GUESS */`
`602`	`604`	`{`
	`605`	`+ControlFile.checkPointCopy.ThisTimeLineID=2;`
`603`	`606`	`ControlFile.checkPointCopy.redo.xlogid=0;`
`604`	`607`	`ControlFile.checkPointCopy.redo.xrecoff=SizeOfXLogLongPHD;`
`605`	`608`	`ControlFile.checkPointCopy.undo=ControlFile.checkPointCopy.redo;`
`@@ -609,6 +612,7 @@ RestoreControlValues(int mode)`
`609`	`612`	`ControlFile.checkPointCopy.nextMultiOffset=0;`
`610`	`613`	`ControlFile.checkPointCopy.time=time(NULL);`
`611`	`614`	`ControlFile.checkPoint=ControlFile.checkPointCopy.redo;`
	`615`	`+`
`612`	`616`	`/*`
`613`	`617`	`* Create a new unique installation identifier, since we can no longer`
`614`	`618`	`* use any old XLOG records. See notes in xlog.c about the algorithm.`
`@@ -644,6 +648,7 @@ RestoreControlValues(int mode)`
`644`	`648`	`exit(1);`
`645`	`649`	`}`
`646`	`650`	`StrNCpy(ControlFile.lc_collate,localeptr,LOCALE_NAME_BUFLEN);`
	`651`	`+`
`647`	`652`	`localeptr=setlocale(LC_CTYPE,"");`
`648`	`653`	`if (!localeptr)`
`649`	`654`	`{`

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!

Commit1865fb6

File tree

1 file changed

1 file changed

`‎src/bin/pg_resetxlog/pg_resetxlog.c‎`

0 commit comments