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

Commit161d9d5

Browse files
committed
Now that streaming replication switches between streaming mode and
restoring from archive, the last WAL segment is not necessarily open atthe end of recovery. Fix assertion that assumed that.Fujii Masao, fixing the assertion failure reported by Martin Pihlak.
1 parent76b6ee3 commit161d9d5

File tree

1 file changed

+8
-10
lines changed
  • src/backend/access/transam

1 file changed

+8
-10
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2010, 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.369 2010/02/08 09:08:51 heikki Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.370 2010/02/1008:25:25 heikki Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -5085,16 +5085,14 @@ exitArchiveRecovery(TimeLineID endTLI, uint32 endLogId, uint32 endLogSeg)
50855085
UpdateMinRecoveryPoint(InvalidXLogRecPtr, true);
50865086

50875087
/*
5088-
* We should have the ending log segment currently open. Verify, and then
5089-
* close it (to avoid problems on Windows with trying to rename or delete
5090-
* an open file).
5088+
* If the ending log segment is still open, close it (to avoid
5089+
* problems on Windows with trying to rename or delete an open file).
50915090
*/
5092-
Assert(readFile >=0);
5093-
Assert(readId==endLogId);
5094-
Assert(readSeg==endLogSeg);
5095-
5096-
close(readFile);
5097-
readFile=-1;
5091+
if (readFile >=0)
5092+
{
5093+
close(readFile);
5094+
readFile=-1;
5095+
}
50985096

50995097
/*
51005098
* If the segment was fetched from archival storage, we want to replace

0 commit comments

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