Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf0eb3e5

Browse files
committed
Fix incorrect archive truncation point calculation in the %r recovery_command
parameter. This fixes bug 4137 reported by Wojciech Strzalka, where a WALfile is deleted too early when starting the recovery of a warm standby server.Also add a sanity check in pg_standby so that it will refuse to delete anythingearlier than the file being restored, and improve the debug message in casenothing is deleted.Simon Riggs. Backpatch to 8.3, which is where %r was introduced.
1 parent706fcbd commitf0eb3e5

File tree

2 files changed

+44
-7
lines changed

2 files changed

+44
-7
lines changed

‎contrib/pg_standby/pg_standby.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,15 @@ SetWALFileNameForCleanup(void)
297297

298298
if (restartWALFileName)
299299
{
300+
/*
301+
* Don't do cleanup if the restartWALFileName provided
302+
* is later than the xlog file requested. This is an error
303+
* and we must not remove these files from archive.
304+
* This shouldn't happen, but better safe than sorry.
305+
*/
306+
if (strcmp(restartWALFileName,nextWALFileName)>0)
307+
return false;
308+
300309
strcpy(exclusiveCleanupFileName,restartWALFileName);
301310
return true;
302311
}
@@ -584,7 +593,11 @@ main(int argc, char **argv)
584593
fprintf(stderr,"\nMax wait interval: %d %s",
585594
maxwaittime, (maxwaittime>0 ?"seconds" :"forever"));
586595
fprintf(stderr,"\nCommand for restore: %s",restoreCommand);
587-
fprintf(stderr,"\nKeep archive history: %s and later",exclusiveCleanupFileName);
596+
fprintf(stderr,"\nKeep archive history: ");
597+
if (need_cleanup)
598+
fprintf(stderr,"%s and later",exclusiveCleanupFileName);
599+
else
600+
fprintf(stderr,"No cleanup required");
588601
fflush(stderr);
589602
}
590603

‎src/backend/access/transam/xlog.c

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.300 2008/04/24 14:23:43 mha Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.301 2008/05/09 14:27:47 heikki Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -2483,6 +2483,35 @@ RestoreArchivedFile(char *path, const char *xlogfname,
24832483
xlogpath)));
24842484
}
24852485

2486+
/*
2487+
* Calculate the archive file cutoff point for use during log shipping
2488+
* replication. All files earlier than this point can be deleted
2489+
* from the archive, though there is no requirement to do so.
2490+
*
2491+
* We initialise this with the filename of an InvalidXLogRecPtr, which
2492+
* will prevent the deletion of any WAL files from the archive
2493+
* because of the alphabetic sorting property of WAL filenames.
2494+
*
2495+
* Once we have successfully located the redo pointer of the checkpoint
2496+
* from which we start recovery we never request a file prior to the redo
2497+
* pointer of the last restartpoint. When redo begins we know that we
2498+
* have successfully located it, so there is no need for additional
2499+
* status flags to signify the point when we can begin deleting WAL files
2500+
* from the archive.
2501+
*/
2502+
if (InRedo)
2503+
{
2504+
XLByteToSeg(ControlFile->checkPointCopy.redo,
2505+
restartLog,restartSeg);
2506+
XLogFileName(lastRestartPointFname,
2507+
ControlFile->checkPointCopy.ThisTimeLineID,
2508+
restartLog,restartSeg);
2509+
/* we shouldn't need anything earlier than last restart point */
2510+
Assert(strcmp(lastRestartPointFname,xlogfname)<0);
2511+
}
2512+
else
2513+
XLogFileName(lastRestartPointFname,0,0,0);
2514+
24862515
/*
24872516
* construct the command to be executed
24882517
*/
@@ -2512,11 +2541,6 @@ RestoreArchivedFile(char *path, const char *xlogfname,
25122541
case'r':
25132542
/* %r: filename of last restartpoint */
25142543
sp++;
2515-
XLByteToSeg(ControlFile->checkPointCopy.redo,
2516-
restartLog,restartSeg);
2517-
XLogFileName(lastRestartPointFname,
2518-
ControlFile->checkPointCopy.ThisTimeLineID,
2519-
restartLog,restartSeg);
25202544
StrNCpy(dp,lastRestartPointFname,endp-dp);
25212545
dp+=strlen(dp);
25222546
break;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp