db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-02-03 14:01:57 +02:00
Code Issues Releases Activity

Make parsexlog messages using capital letter

Browse Source
This commit is contained in:
Arthur Zakirov 2019-03-14 18:59:28 +03:00
parent be3b04b728
commit afa0081a41
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/parsexlog.c
View File

@ -390,29 +390,29 @@ validate_wal(pgBackup *backup, const char *archivedir,
/* There are all needed WAL records */
if (all_wal)
elog(INFO, "backup validation completed successfully on time %s, xid " XID_FMT " and LSN %X/%X",
elog(INFO, "Backup validation completed successfully on time %s, xid " XID_FMT " and LSN %X/%X",
last_timestamp, last_rec.rec_xid,
(uint32) (last_rec.rec_lsn >> 32), (uint32) last_rec.rec_lsn);
/* Some needed WAL records are absent */
else
{
elog(WARNING, "recovery can be done up to time %s, xid " XID_FMT " and LSN %X/%X",
elog(WARNING, "Recovery can be done up to time %s, xid " XID_FMT " and LSN %X/%X",
last_timestamp, last_rec.rec_xid,
(uint32) (last_rec.rec_lsn >> 32), (uint32) last_rec.rec_lsn);
if (target_time > 0)
time2iso(target_timestamp, lengthof(target_timestamp), target_time);
if (TransactionIdIsValid(target_xid) && target_time != 0)
elog(ERROR, "not enough WAL records to time %s and xid " XID_FMT,
elog(ERROR, "Not enough WAL records to time %s and xid " XID_FMT,
target_timestamp, target_xid);
else if (TransactionIdIsValid(target_xid))
elog(ERROR, "not enough WAL records to xid " XID_FMT,
elog(ERROR, "Not enough WAL records to xid " XID_FMT,
target_xid);
else if (target_time != 0)
elog(ERROR, "not enough WAL records to time %s",
elog(ERROR, "Not enough WAL records to time %s",
target_timestamp);
else if (XRecOffIsValid(target_lsn))
elog(ERROR, "not enough WAL records to lsn %X/%X",
elog(ERROR, "Not enough WAL records to lsn %X/%X",
(uint32) (target_lsn >> 32), (uint32) (target_lsn));
}
}
@ -458,11 +458,11 @@ read_recovery_info(const char *archivedir, TimeLineID tli, uint32 wal_seg_size,
errptr = startpoint ? startpoint : xlogreader->EndRecPtr;
if (errormsg)
elog(ERROR, "could not read WAL record at %X/%X: %s",
elog(ERROR, "Could not read WAL record at %X/%X: %s",
(uint32) (errptr >> 32), (uint32) (errptr),
errormsg);
else
elog(ERROR, "could not read WAL record at %X/%X",
elog(ERROR, "Could not read WAL record at %X/%X",
(uint32) (errptr >> 32), (uint32) (errptr));
}
@ -1042,13 +1042,13 @@ XLogThreadWorker(void *arg)
else
{
if (xlogreader->errormsg_buf[0] != '\0')
elog(WARNING, "Thread [%d]: could not read WAL record at %X/%X: %s",
elog(WARNING, "Thread [%d]: Could not read WAL record at %X/%X: %s",
reader_data->thread_num,
(uint32) (thread_arg->startpoint >> 32),
(uint32) (thread_arg->startpoint),
xlogreader->errormsg_buf);
else
elog(WARNING, "Thread [%d]: could not read WAL record at %X/%X",
elog(WARNING, "Thread [%d]: Could not read WAL record at %X/%X",
reader_data->thread_num,
(uint32) (thread_arg->startpoint >> 32),
(uint32) (thread_arg->startpoint));
@ -1125,12 +1125,12 @@ XLogThreadWorker(void *arg)
thread_arg->startpoint : xlogreader->EndRecPtr;
if (errormsg)
elog(WARNING, "Thread [%d]: could not read WAL record at %X/%X: %s",
elog(WARNING, "Thread [%d]: Could not read WAL record at %X/%X: %s",
reader_data->thread_num,
(uint32) (errptr >> 32), (uint32) (errptr),
errormsg);
else
elog(WARNING, "Thread [%d]: could not read WAL record at %X/%X",
elog(WARNING, "Thread [%d]: Could not read WAL record at %X/%X",
reader_data->thread_num,
(uint32) (errptr >> 32), (uint32) (errptr));

14
tests/validate_test.py
View File

@ -96,7 +96,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
# Validate to real time
self.assertIn(
"INFO: backup validation completed successfully",
"INFO: Backup validation completed successfully",
self.validate_pb(
backup_dir, 'node',
options=["--time={0}".format(target_time), "-j", "4"]),
@ -134,7 +134,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
repr(self.output), self.cmd))
except ProbackupException as e:
self.assertTrue(
'ERROR: not enough WAL records to time' in e.message,
'ERROR: Not enough WAL records to time' in e.message,
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
repr(e.message), self.cmd))
@ -148,7 +148,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
self.switch_wal_segment(node)
self.assertIn(
"INFO: backup validation completed successfully",
"INFO: Backup validation completed successfully",
self.validate_pb(
backup_dir, 'node', options=["--xid={0}".format(target_xid),
"-j", "4"]),
@ -168,7 +168,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
repr(self.output), self.cmd))
except ProbackupException as e:
self.assertTrue(
'ERROR: not enough WAL records to xid' in e.message,
'ERROR: Not enough WAL records to xid' in e.message,
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
repr(e.message), self.cmd))
@ -1580,9 +1580,9 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
repr(self.output), self.cmd))
except ProbackupException as e:
self.assertTrue(
'ERROR: not enough WAL records to xid' in e.message and
'WARNING: recovery can be done up to time' in e.message and
"ERROR: not enough WAL records to xid {0}\n".format(
'ERROR: Not enough WAL records to xid' in e.message and
'WARNING: Recovery can be done up to time' in e.message and
"ERROR: Not enough WAL records to xid {0}\n".format(
target_xid),
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
repr(e.message), self.cmd))