Fix STOP WAL LOCATION in backup history files no to return the next

segment of XLOG_BACKUP_END record even if the the record is placed
at a segment boundary. Furthermore the previous implementation could
return nonexistent segment file name when the boundary is in segments
that has "FE" suffix; We never use segments with "FF" suffix.

Backpatch to 8.0, where hot backup was introduced.

Reported by Fujii Masao.
This commit is contained in:
Itagaki Takahiro 2010-02-19 01:04:03 +00:00
parent a39f02e369
commit 3230fd056a

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.375 2010/02/17 04:19:39 tgl Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.376 2010/02/19 01:04:03 itagaki Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -8052,7 +8052,7 @@ pg_stop_backup(PG_FUNCTION_ARGS)
*/ */
RequestXLogSwitch(); RequestXLogSwitch();
XLByteToSeg(stoppoint, _logId, _logSeg); XLByteToPrevSeg(stoppoint, _logId, _logSeg);
XLogFileName(stopxlogfilename, ThisTimeLineID, _logId, _logSeg); XLogFileName(stopxlogfilename, ThisTimeLineID, _logId, _logSeg);
/* Use the log timezone here, not the session timezone */ /* Use the log timezone here, not the session timezone */