1
0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-02-03 14:01:57 +02:00

Merge branch 'master' into pgpro-2065

This commit is contained in:
Grigory Smolkin 2019-04-13 23:31:39 +03:00
commit d1e616e2f1

View File

@ -253,9 +253,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
fname = self.id().split('.')[3] fname = self.id().split('.')[3]
node = self.make_simple_node( node = self.make_simple_node(
base_dir=os.path.join(module_name, fname, 'node'), base_dir=os.path.join(module_name, fname, 'node'),
initdb_params=['--data-checksums'], initdb_params=['--data-checksums'])
pg_options={
'max_wal_senders': '2'})
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup') backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
self.init_pb(backup_dir) self.init_pb(backup_dir)
@ -326,9 +324,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
base_dir=os.path.join(module_name, fname, 'node'), base_dir=os.path.join(module_name, fname, 'node'),
set_replication=True, set_replication=True,
initdb_params=['--data-checksums'], initdb_params=['--data-checksums'],
pg_options={ pg_options={'autovacuum': 'off'})
'max_wal_senders': '2',
'autovacuum': 'off'})
self.init_pb(backup_dir, old_binary=True) self.init_pb(backup_dir, old_binary=True)
self.show_pb(backup_dir) self.show_pb(backup_dir)
@ -429,9 +425,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
base_dir=os.path.join(module_name, fname, 'node'), base_dir=os.path.join(module_name, fname, 'node'),
set_replication=True, set_replication=True,
initdb_params=['--data-checksums'], initdb_params=['--data-checksums'],
pg_options={ pg_options={'autovacuum': 'off'})
'max_wal_senders': '2',
'autovacuum': 'off'})
self.init_pb(backup_dir, old_binary=True) self.init_pb(backup_dir, old_binary=True)
self.show_pb(backup_dir) self.show_pb(backup_dir)
@ -523,9 +517,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
base_dir=os.path.join(module_name, fname, 'node'), base_dir=os.path.join(module_name, fname, 'node'),
set_replication=True, set_replication=True,
initdb_params=['--data-checksums'], initdb_params=['--data-checksums'],
pg_options={ pg_options={'autovacuum': 'off'})
'max_wal_senders': '2',
'autovacuum': 'off'})
self.init_pb(backup_dir, old_binary=True) self.init_pb(backup_dir, old_binary=True)
self.show_pb(backup_dir) self.show_pb(backup_dir)
@ -641,12 +633,10 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
base_dir=os.path.join(module_name, fname, 'node'), base_dir=os.path.join(module_name, fname, 'node'),
set_replication=True, set_replication=True,
initdb_params=['--data-checksums'], initdb_params=['--data-checksums'],
pg_options={ pg_options={'autovacuum': 'off'})
'max_wal_senders': '2',
'autovacuum': 'off'})
self.init_pb(backup_dir) self.init_pb(backup_dir)
self.add_instance(backup_dir, 'node', node) self.add_instance(backup_dir, 'node', node, old_binary=True)
node.slow_start() node.slow_start()
node.pgbench_init(scale=5) node.pgbench_init(scale=5)