rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pg_resetxlog.

Simon
This commit is contained in:
Bruce Momjian 2006-04-26 18:56:56 +00:00
parent 0a646e801c
commit 1865fb66fa
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/pg_resetxlog/pg_resetxlog.c
View File

@ -565,7 +565,7 @@ RestoreControlValues(int mode)
{ {
struct timeval tv; struct timeval tv;
char *localeptr; char *localeptr;
bool successed=true; bool successed = true;
/* /*
* Set up a completely default set of pg_control values. * Set up a completely default set of pg_control values.
@ -579,27 +579,30 @@ RestoreControlValues(int mode)
* update the checkpoint value in control file,by searching * update the checkpoint value in control file,by searching
* xlog segment file, or just guessing it. * xlog segment file, or just guessing it.
*/ */
if (mode == WAL) if (mode == WAL)
{ {
int result = SearchLastCheckpoint(); int result = SearchLastCheckpoint();
if ( result > 0 ) /* The last checkpoint had been found. */
if (result > 0) /* The last checkpoint had been found. */
{ {
ControlFile.checkPointCopy = lastcheckpoint; ControlFile.checkPointCopy = lastcheckpoint;
ControlFile.checkPointCopy.ThisTimeLineID = LastXLogFile->tli;
ControlFile.checkPoint = lastchkp; ControlFile.checkPoint = lastchkp;
ControlFile.prevCheckPoint = prevchkp; ControlFile.prevCheckPoint = prevchkp;
ControlFile.logId = LastXLogFile->logid; ControlFile.logId = LastXLogFile->logid;
ControlFile.logSeg = LastXLogFile->seg + 1; ControlFile.logSeg = LastXLogFile->seg + 1;
ControlFile.checkPointCopy.ThisTimeLineID = LastXLogFile->tli;
ControlFile.state = state; ControlFile.state = state;
} else successed = false; }
else
successed = false;
/* Clean up the list. */ /* Clean up the list. */
CleanUpList(xlogfilelist); CleanUpList(xlogfilelist);
}
} else /* GUESS */
if (mode == GUESS)
{ {
ControlFile.checkPointCopy.ThisTimeLineID = 2;
ControlFile.checkPointCopy.redo.xlogid = 0; ControlFile.checkPointCopy.redo.xlogid = 0;
ControlFile.checkPointCopy.redo.xrecoff = SizeOfXLogLongPHD; ControlFile.checkPointCopy.redo.xrecoff = SizeOfXLogLongPHD;
ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo; ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo;
@ -609,6 +612,7 @@ RestoreControlValues(int mode)
ControlFile.checkPointCopy.nextMultiOffset = 0; ControlFile.checkPointCopy.nextMultiOffset = 0;
ControlFile.checkPointCopy.time = time(NULL); ControlFile.checkPointCopy.time = time(NULL);
ControlFile.checkPoint = ControlFile.checkPointCopy.redo; ControlFile.checkPoint = ControlFile.checkPointCopy.redo;
/* /*
* Create a new unique installation identifier, since we can no longer * Create a new unique installation identifier, since we can no longer
* use any old XLOG records. See notes in xlog.c about the algorithm. * use any old XLOG records. See notes in xlog.c about the algorithm.
@ -644,6 +648,7 @@ RestoreControlValues(int mode)
exit(1); exit(1);
} }
StrNCpy(ControlFile.lc_collate, localeptr, LOCALE_NAME_BUFLEN); StrNCpy(ControlFile.lc_collate, localeptr, LOCALE_NAME_BUFLEN);
localeptr = setlocale(LC_CTYPE, ""); localeptr = setlocale(LC_CTYPE, "");
if (!localeptr) if (!localeptr)
{ {