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

Commit0dba271

Browse files
committed
if WAL segment required to create pagemap is absent, throw an ERROR
1 parent8c74cf7 commit0dba271

File tree

2 files changed

+35
-17
lines changed

2 files changed

+35
-17
lines changed

‎parsexlog.c

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,27 +123,38 @@ extractPageMap(const char *archivedir, XLogRecPtr startpoint, TimeLineID tli,
123123
do
124124
{
125125
record=XLogReadRecord(xlogreader,startpoint,&errormsg);
126+
126127
if (record==NULL)
127128
{
128129
XLogRecPtrerrptr;
129130

130131
errptr=startpoint ?startpoint :xlogreader->EndRecPtr;
131132

132133
if (errormsg)
133-
elog(ERROR,"could not read WAL record at %X/%X: %s",
134+
elog(WARNING,"could not read WAL record at %X/%X: %s",
134135
(uint32) (errptr >>32), (uint32) (errptr),
135136
errormsg);
136137
else
137-
elog(ERROR,"could not read WAL record at %X/%X",
138+
elog(WARNING,"could not read WAL record at %X/%X",
138139
(uint32) (errptr >>32), (uint32) (errptr));
140+
141+
/*
142+
* If we don't have all WAL files from prev backup start_lsn to current
143+
* start_lsn, we won't be able to build page map and PAGE backup will
144+
* be incorrect. Stop it and throw an error.
145+
*/
146+
if (!xlogexists)
147+
elog(ERROR,"WAL segment \"%s\" is absent",xlogfpath);
148+
elseif (xlogreadfd!=-1)
149+
elog(ERROR,"Possible WAL CORRUPTION."
150+
"Error has occured during reading WAL segment \"%s\"",xlogfpath);
139151
}
140152

141153
extractPageInfo(xlogreader);
142154

143155
startpoint=InvalidXLogRecPtr;/* continue reading at next record */
144156

145157
XLByteToSeg(xlogreader->EndRecPtr,nextSegNo);
146-
147158
}while (nextSegNo <=endSegNo&&xlogreader->EndRecPtr!=endpoint);
148159

149160
XLogReaderFree(xlogreader);
@@ -228,6 +239,8 @@ validate_wal(pgBackup *backup,
228239
startpoint=InvalidXLogRecPtr;/* continue reading at next record */
229240
}
230241

242+
243+
/* TODO Add comment */
231244
if (last_time>0)
232245
time2iso(last_timestamp,lengthof(last_timestamp),
233246
timestamptz_to_time_t(last_time));
@@ -237,33 +250,37 @@ validate_wal(pgBackup *backup,
237250
if (last_xid==InvalidTransactionId)
238251
last_xid=backup->recovery_xid;
239252

240-
/* There are allneed WAL records */
253+
/* There are allneeded WAL records */
241254
if (all_wal)
242255
elog(INFO,"backup validation completed successfully on time %s and xid "XID_FMT,
243256
last_timestamp,last_xid);
244-
/*There are not needWAL records */
257+
/*Some neededWAL records are absent */
245258
else
246259
{
247260
if (xlogfpath[0]!=0)
248261
{
249-
/* Update backup status */
250-
backup->status=BACKUP_STATUS_CORRUPT;
251-
pgBackupWriteBackupControlFile(backup);
252-
253-
/* XLOG reader couldnt read WAL segment */
262+
/* XLOG reader couldn't read WAL segment.
263+
* We throw a WARNING here to be able to update backup status below.
264+
*/
254265
if (!xlogexists)
266+
{
255267
elog(WARNING,"WAL segment \"%s\" is absent",xlogfpath);
268+
}
256269
elseif (xlogreadfd!=-1)
257-
elog(ERROR,"Possible WAL CORRUPTION."
258-
"Error has occured during reading WAL segment \"%s\"",xlogfpath);
270+
{
271+
elog(WARNING,"Possible WAL CORRUPTION."
272+
"Error has occured during reading WAL segment \"%s\"",xlogfpath);
273+
}
259274
}
260275

261276
if (!got_endpoint)
262277
{
263-
/* Update backup status */
278+
/*
279+
* If we don't have WAL between start_lsn and stop_lsn,
280+
* the backup is definitely corrupted. Update its status.
281+
*/
264282
backup->status=BACKUP_STATUS_CORRUPT;
265283
pgBackupWriteBackupControlFile(backup);
266-
267284
elog(ERROR,"there are not enough WAL records to restore from %X/%X to %X/%X",
268285
(uint32) (backup->start_lsn >>32),
269286
(uint32) (backup->start_lsn),

‎tests/validate_test.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def __init__(self, *args, **kwargs):
1717
deftearDownClass(cls):
1818
stop_all()
1919

20-
#@unittest.skip("skip")
21-
#@unittest.expectedFailure
20+
#@unittest.skip("skip")
21+
#@unittest.expectedFailure
2222
deftest_validate_wal_unreal_values(self):
2323
"""recovery to latest from full backup"""
2424
fname=self.id().split('.')[3]
@@ -177,6 +177,7 @@ def test_validate_broken_wal_2(self):
177177
self.assertEqual('CORRUPT',self.show_pb(node,id=backup_id)['status'],'Backup STATUS should be "CORRUPT"')
178178
node.stop()
179179

180+
@unittest.skip("skip")
180181
deftest_validate_wal_lost_segment_1(self):
181182
"""Loose segment which belong to some backup"""
182183
fname=self.id().split('.')[3]
@@ -245,5 +246,5 @@ def test_validate_wal_lost_segment_2(self):
245246
self.backup_pb(node,backup_type='page')
246247
self.assertEqual(1,0,"Expecting Error in PAGE backup because of wal segment disappearance")
247248
exceptProbackupException,e:
248-
self.assertEqual(True,'could not read WAL record'ine.message)
249+
self.assertEqual(True,'is absent'ine.message)
249250
node.stop()

0 commit comments

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