db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-07-06 05:57:21 +02:00
Code Issues Releases Activity

Modifyed test test_arhive_push_file_exists. Fixed fileEqualCRC()

Browse Source 
error handling
This commit is contained in:
Sergey Cherkashin
2018-10-18 12:06:54 +03:00
parent 6deb3bbe2b
commit 20d4dcc291
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/data.c
View File

@ -1751,26 +1751,21 @@ fileEqualCRC(const char *path1, const char *path2, bool path2_is_compressed)
INIT_CRC32C(crc2); INIT_CRC32C(crc2);
gz_in = gzopen(path2, PG_BINARY_R); gz_in = gzopen(path2, PG_BINARY_R);
if (gz_in == NULL) if (gz_in == NULL)
{ /* File cannot be read */
/* There is no such file or it cannot be read */ elog(ERROR,
elog(LOG,
"Cannot compare WAL file \"%s\" with compressed \"%s\"", "Cannot compare WAL file \"%s\" with compressed \"%s\"",
path1, path2); path1, path2);
return false;
}
for (;;) for (;;)
{ {
size_t read_len = 0; size_t read_len = 0;
read_len = gzread(gz_in, buf, sizeof(buf)); read_len = gzread(gz_in, buf, sizeof(buf));
if (read_len != sizeof(buf) && !gzeof(gz_in)) if (read_len != sizeof(buf) && !gzeof(gz_in))
{
/* An error occurred while reading the file */ /* An error occurred while reading the file */
elog(LOG, elog(ERROR,
"Cannot compare WAL file \"%s\" with compressed \"%s\"", "Cannot compare WAL file \"%s\" with compressed \"%s\"",
path1, path2); path1, path2);
return false;
}
COMP_CRC32C(crc2, buf, read_len); COMP_CRC32C(crc2, buf, read_len);
if (gzeof(gz_in) || read_len == 0) if (gzeof(gz_in) || read_len == 0)
break; break;

12
tests/archive.py
View File

@ -1,4 +1,6 @@
import os import os
import shutil
import zlib
import unittest import unittest
from .helpers.ptrack_helpers import ProbackupTest, ProbackupException, archive_script from .helpers.ptrack_helpers import ProbackupTest, ProbackupException, archive_script
from datetime import datetime, timedelta from datetime import datetime, timedelta
@ -325,7 +327,15 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
) )
self.assertFalse('pg_probackup archive-push completed successfully' in log_content) self.assertFalse('pg_probackup archive-push completed successfully' in log_content)
os.remove(file) wal_src = os.path.join(node.data_dir, 'pg_wal', '000000010000000000000001')
if self.archive_compress:
with open(wal_src, 'rb') as f_in, open(file, 'wb') as f_out:
original_wal = f_in.read()
compressed_wal = zlib.compress(original_wal, 1)
f_out.write(compressed_wal)
else:
shutil.copyfile(wal_src, file)
self.switch_wal_segment(node) self.switch_wal_segment(node)
sleep(5) sleep(5)