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

Per Tom, do full reset on -x flag.

This commit is contained in:
Bruce Momjian 2002-01-10 18:08:29 +00:00
parent f6e603cffa
commit 872aad61ff
1 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
contrib/pg_resetxlog/pg_resetxlog.c
View File

@ -23,7 +23,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.11 2002/01/10 17:51:52 momjian Exp $ * $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/pg_resetxlog.c,v 1.12 2002/01/10 18:08:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -714,32 +714,30 @@ RewriteControlFile(TransactionId set_xid)
int fd; int fd;
char buffer[BLCKSZ]; /* need not be aligned */ char buffer[BLCKSZ]; /* need not be aligned */
if (set_xid == 0) /*
{ * Adjust fields as needed to force an empty XLOG starting at the next
/* * available segment.
* Adjust fields as needed to force an empty XLOG starting at the next */
* available segment. newXlogId = ControlFile.logId;
*/ newXlogSeg = ControlFile.logSeg;
newXlogId = ControlFile.logId; /* be sure we wrap around correctly at end of a logfile */
newXlogSeg = ControlFile.logSeg; NextLogSeg(newXlogId, newXlogSeg);
/* be sure we wrap around correctly at end of a logfile */
NextLogSeg(newXlogId, newXlogSeg); ControlFile.checkPointCopy.redo.xlogid = newXlogId;
ControlFile.checkPointCopy.redo.xrecoff =
ControlFile.checkPointCopy.redo.xlogid = newXlogId; newXlogSeg * XLogSegSize + SizeOfXLogPHD;
ControlFile.checkPointCopy.redo.xrecoff = ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo;
newXlogSeg * XLogSegSize + SizeOfXLogPHD; ControlFile.checkPointCopy.time = time(NULL);
ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo;
ControlFile.checkPointCopy.time = time(NULL); ControlFile.state = DB_SHUTDOWNED;
ControlFile.time = time(NULL);
ControlFile.state = DB_SHUTDOWNED; ControlFile.logId = newXlogId;
ControlFile.time = time(NULL); ControlFile.logSeg = newXlogSeg + 1;
ControlFile.logId = newXlogId; ControlFile.checkPoint = ControlFile.checkPointCopy.redo;
ControlFile.logSeg = newXlogSeg + 1; ControlFile.prevCheckPoint.xlogid = 0;
ControlFile.checkPoint = ControlFile.checkPointCopy.redo; ControlFile.prevCheckPoint.xrecoff = 0;
ControlFile.prevCheckPoint.xlogid = 0;
ControlFile.prevCheckPoint.xrecoff = 0; if (set_xid != 0)
}
else
ControlFile.checkPointCopy.nextXid = set_xid; ControlFile.checkPointCopy.nextXid = set_xid;
/* Contents are protected with a CRC */ /* Contents are protected with a CRC */
@ -1011,20 +1009,6 @@ main(int argc, char **argv)
if (!ReadControlFile()) if (!ReadControlFile())
GuessControlValues(); GuessControlValues();
/*
* Set XID in pg_control and exit
*/
if (set_xid)
{
if (guessed)
{
printf("\npg_control appears corrupt. Can not update XID.\n");
exit(1);
}
RewriteControlFile(set_xid);
exit(0);
}
/* /*
* If we had to guess anything, and -f was not given, just print the * If we had to guess anything, and -f was not given, just print the
* guessed values and exit. Also print if -n is given. * guessed values and exit. Also print if -n is given.
@ -1051,7 +1035,7 @@ main(int argc, char **argv)
/* /*
* Else, do the dirty deed. * Else, do the dirty deed.
*/ */
RewriteControlFile(0); RewriteControlFile(set_xid);
KillExistingXLOG(); KillExistingXLOG();
WriteEmptyXLOG(); WriteEmptyXLOG();