db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-01-26 11:54:25 +02:00
Code Issues Releases Activity

Fix message in valid_wal()

Browse Source
This commit is contained in:
Artur Zakirov 2017-02-16 19:58:25 +03:00
parent a3e5458166
commit 8fdbe1ede9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
parsexlog.c
View File

@ -36,6 +36,7 @@ static bool getRecordTimestamp(XLogReaderState *record, TimestampTz *recordXtime
static int xlogreadfd = -1; static int xlogreadfd = -1;
static XLogSegNo xlogreadsegno = -1; static XLogSegNo xlogreadsegno = -1;
static char xlogfpath[MAXPGPATH]; static char xlogfpath[MAXPGPATH];
static bool xlogexists = false;
typedef struct XLogPageReadPrivate typedef struct XLogPageReadPrivate
{ {
@ -98,6 +99,7 @@ extractPageMap(const char *archivedir, XLogRecPtr startpoint, TimeLineID tli,
{ {
close(xlogreadfd); close(xlogreadfd);
xlogreadfd = -1; xlogreadfd = -1;
xlogexists = false;
} }
} }
@ -192,9 +194,9 @@ validate_wal(pgBackup *backup,
if (xlogfpath[0] != 0) if (xlogfpath[0] != 0)
{ {
/* XLOG reader couldnt read WAL segment */ /* XLOG reader couldnt read WAL segment */
if (xlogreadfd < 0) if (!xlogexists)
elog(WARNING, "WAL segment \"%s\" is absent", xlogfpath); elog(WARNING, "WAL segment \"%s\" is absent", xlogfpath);
else else if (xlogreadfd != -1)
elog(WARNING, "error was occured during reading WAL segment \"%s\"", elog(WARNING, "error was occured during reading WAL segment \"%s\"",
xlogfpath); xlogfpath);
} }
@ -232,6 +234,7 @@ validate_wal(pgBackup *backup,
{ {
close(xlogreadfd); close(xlogreadfd);
xlogreadfd = -1; xlogreadfd = -1;
xlogexists = false;
} }
} }
@ -256,6 +259,7 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
{ {
close(xlogreadfd); close(xlogreadfd);
xlogreadfd = -1; xlogreadfd = -1;
xlogexists = false;
} }
XLByteToSeg(targetPagePtr, xlogreadsegno); XLByteToSeg(targetPagePtr, xlogreadsegno);
@ -272,11 +276,12 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
{ {
elog(LOG, "opening WAL segment \"%s\"", xlogfpath); elog(LOG, "opening WAL segment \"%s\"", xlogfpath);
xlogexists = true;
xlogreadfd = open(xlogfpath, O_RDONLY | PG_BINARY, 0); xlogreadfd = open(xlogfpath, O_RDONLY | PG_BINARY, 0);
if (xlogreadfd < 0) if (xlogreadfd < 0)
{ {
elog(INFO, "could not open WAL segment \"%s\": %s", elog(WARNING, "could not open WAL segment \"%s\": %s",
xlogfpath, strerror(errno)); xlogfpath, strerror(errno));
return -1; return -1;
} }