db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

Merge branch 'master' into pgpro-2065

Browse Source
This commit is contained in:
Anastasia
2019-04-17 17:20:33 +03:00
parent ce29d91957 2efce08756
commit 6d0059092c
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/helpers/ptrack_helpers.py
+5
View File
@@ -431,7 +431,12 @@ class ProbackupTest(object):
header_size = 24
ptrack_bits_for_fork = []
# TODO: use macro instead of hard coded 8KB
page_body_size = 8192-header_size
# Check that if main fork file size is 0, it`s ok
# to not having a _ptrack fork
if os.path.getsize(file) == 0:
return ptrack_bits_for_fork
byte_size = os.path.getsize(file + '_ptrack')
npages = byte_size/8192
if byte_size % 8192 != 0:
tests/ptrack.py
+7 -8
View File
@@ -2554,7 +2554,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
# Clean after yourself
self.del_test_dir(module_name, fname)
# @unittest.skip("skip")
@unittest.skip("skip")
def test_ptrack_truncate_replica(self):
fname = self.id().split('.')[3]
master = self.make_simple_node(
@@ -2563,9 +2563,9 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
initdb_params=['--data-checksums'],
pg_options={
'ptrack_enable': 'on',
'wal_level': 'replica',
'max_wal_senders': '2',
'checkpoint_timeout': '30'})
'max_wal_size': '16MB',
'archive_timeout': '10s',
'checkpoint_timeout': '30s'})
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
self.init_pb(backup_dir)
@@ -2620,6 +2620,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
backup_dir, 'replica', replica,
options=[
'-j10',
'--stream',
'--master-host=localhost',
'--master-db=postgres',
'--master-port={0}'.format(master.port)])
@@ -2656,8 +2657,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
success = False
self.assertTrue(
success, 'Ptrack has failed to register changes in data files'
)
success, 'Ptrack has failed to register changes in data files')
# Clean after yourself
self.del_test_dir(module_name, fname)
@@ -3493,8 +3493,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
success = False
self.assertTrue(
success, 'Ptrack has failed to register changes in data files'
)
success, 'Ptrack has failed to register changes in data files')
# Clean after yourself
self.del_test_dir(module_name, fname)