Skip to content

Commit 49e6710

Browse files
gsmolkgsmolk
committed
Merge branch 'master' into remote_pull
2 parents 6d2a51e + 322b3f0 commit 49e6710

File tree

4 files changed

+90
-110
lines changed

4 files changed

+90
-110
lines changed

‎src/backup.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2770,6 +2770,14 @@ StreamLog(void *arg)
27702770
replication_slot = "pg_probackup_slot";
27712771
#endif
27722772

2773+
2774+
#if PG_VERSION_NUM >= 110000
2775+
/* Create temp repslot */
2776+
if (temp_slot)
2777+
CreateReplicationSlot(stream_arg->conn, replication_slot,
2778+
NULL, temp_slot, true, true, false);
2779+
#endif
2780+
27732781
/*
27742782
* Start the replication
27752783
*/
@@ -2790,7 +2798,9 @@ StreamLog(void *arg)
27902798
ctl.walmethod = CreateWalDirectoryMethod(stream_arg->basedir, 0, true);
27912799
ctl.replication_slot = replication_slot;
27922800
ctl.stop_socket = PGINVALID_SOCKET;
2801+
#if PG_VERSION_NUM >= 100000 && PG_VERSION_NUM < 110000
27932802
ctl.temp_slot = temp_slot;
2803+
#endif
27942804
#else
27952805
ctl.basedir = (char *) stream_arg->basedir;
27962806
#endif

‎tests/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def load_tests(loader, tests, pattern):
2929
suite.addTests(loader.loadTestsFromModule(merge))
3030
suite.addTests(loader.loadTestsFromModule(option_test))
3131
suite.addTests(loader.loadTestsFromModule(page))
32-
suite.addTests(loader.loadTestsFromModule(ptrack))
32+
# suite.addTests(loader.loadTestsFromModule(ptrack))
3333
suite.addTests(loader.loadTestsFromModule(remote))
3434
suite.addTests(loader.loadTestsFromModule(replica))
3535
suite.addTests(loader.loadTestsFromModule(restore_test))

‎tests/backup_test.py

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ def test_backup_modes_archive(self):
1919
base_dir=os.path.join(module_name, fname, 'node'),
2020
initdb_params=['--data-checksums'],
2121
pg_options={
22-
'wal_level': 'replica',
23-
'ptrack_enable': 'on'}
24-
)
22+
'ptrack_enable': 'on'})
23+
2524
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
2625
self.init_pb(backup_dir)
2726
self.add_instance(backup_dir, 'node', node)
@@ -89,9 +88,8 @@ def test_smooth_checkpoint(self):
8988
fname = self.id().split('.')[3]
9089
node = self.make_simple_node(
9190
base_dir=os.path.join(module_name, fname, 'node'),
92-
initdb_params=['--data-checksums'],
93-
pg_options={'wal_level': 'replica'}
94-
)
91+
initdb_params=['--data-checksums'])
92+
9593
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
9694
self.init_pb(backup_dir)
9795
self.add_instance(backup_dir, 'node', node)
@@ -114,8 +112,8 @@ def test_incremental_backup_without_full(self):
114112
node = self.make_simple_node(
115113
base_dir=os.path.join(module_name, fname, 'node'),
116114
initdb_params=['--data-checksums'],
117-
pg_options={'wal_level': 'replica', 'ptrack_enable': 'on'}
118-
)
115+
pg_options={'ptrack_enable': 'on'})
116+
119117
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
120118
self.init_pb(backup_dir)
121119
self.add_instance(backup_dir, 'node', node)
@@ -170,8 +168,8 @@ def test_incremental_backup_corrupt_full(self):
170168
node = self.make_simple_node(
171169
base_dir=os.path.join(module_name, fname, 'node'),
172170
initdb_params=['--data-checksums'],
173-
pg_options={'wal_level': 'replica', 'ptrack_enable': 'on'}
174-
)
171+
pg_options={'ptrack_enable': 'on'})
172+
175173
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
176174
self.init_pb(backup_dir)
177175
self.add_instance(backup_dir, 'node', node)
@@ -235,8 +233,8 @@ def test_ptrack_threads(self):
235233
node = self.make_simple_node(
236234
base_dir=os.path.join(module_name, fname, 'node'),
237235
initdb_params=['--data-checksums'],
238-
pg_options={'wal_level': 'replica', 'ptrack_enable': 'on'}
239-
)
236+
pg_options={'ptrack_enable': 'on'})
237+
240238
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
241239
self.init_pb(backup_dir)
242240
self.add_instance(backup_dir, 'node', node)
@@ -265,10 +263,9 @@ def test_ptrack_threads_stream(self):
265263
set_replication=True,
266264
initdb_params=['--data-checksums'],
267265
pg_options={
268-
'wal_level': 'replica',
269266
'ptrack_enable': 'on',
270-
'max_wal_senders': '2'}
271-
)
267+
'max_wal_senders': '2'})
268+
272269
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
273270
self.init_pb(backup_dir)
274271
self.add_instance(backup_dir, 'node', node)
@@ -295,8 +292,8 @@ def test_page_corruption_heal_via_ptrack_1(self):
295292
base_dir=os.path.join(module_name, fname, 'node'),
296293
set_replication=True,
297294
initdb_params=['--data-checksums'],
298-
pg_options={'wal_level': 'replica', 'max_wal_senders': '2'}
299-
)
295+
pg_options={'max_wal_senders': '2'})
296+
300297
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
301298

302299
self.init_pb(backup_dir)
@@ -352,8 +349,8 @@ def test_page_corruption_heal_via_ptrack_2(self):
352349
base_dir=os.path.join(module_name, fname, 'node'),
353350
set_replication=True,
354351
initdb_params=['--data-checksums'],
355-
pg_options={'wal_level': 'replica', 'max_wal_senders': '2'}
356-
)
352+
pg_options={'max_wal_senders': '2'})
353+
357354
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
358355

359356
self.init_pb(backup_dir)
@@ -425,8 +422,8 @@ def test_tablespace_in_pgdata_pgpro_1376(self):
425422
base_dir=os.path.join(module_name, fname, 'node'),
426423
set_replication=True,
427424
initdb_params=['--data-checksums'],
428-
pg_options={'wal_level': 'replica', 'max_wal_senders': '2'}
429-
)
425+
pg_options={'max_wal_senders': '2'})
426+
430427
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
431428

432429
self.init_pb(backup_dir)
@@ -526,7 +523,6 @@ def test_tablespace_handling(self):
526523
set_replication=True,
527524
initdb_params=['--data-checksums'],
528525
pg_options={
529-
'wal_level': 'replica',
530526
'max_wal_senders': '2'})
531527

532528
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -639,7 +635,6 @@ def test_tablespace_handling_1(self):
639635
set_replication=True,
640636
initdb_params=['--data-checksums'],
641637
pg_options={
642-
'wal_level': 'replica',
643638
'max_wal_senders': '2'})
644639

645640
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -700,7 +695,6 @@ def test_tablespace_handling_2(self):
700695
set_replication=True,
701696
initdb_params=['--data-checksums'],
702697
pg_options={
703-
'wal_level': 'replica',
704698
'max_wal_senders': '2'})
705699

706700
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -751,9 +745,7 @@ def test_drop_rel_during_backup_delta(self):
751745
node = self.make_simple_node(
752746
base_dir=os.path.join(module_name, fname, 'node'),
753747
set_replication=True,
754-
initdb_params=['--data-checksums'],
755-
pg_options={
756-
'wal_level': 'replica'})
748+
initdb_params=['--data-checksums'])
757749

758750
self.init_pb(backup_dir)
759751
self.add_instance(backup_dir, 'node', node)
@@ -820,9 +812,7 @@ def test_drop_rel_during_backup_page(self):
820812
node = self.make_simple_node(
821813
base_dir=os.path.join(module_name, fname, 'node'),
822814
set_replication=True,
823-
initdb_params=['--data-checksums'],
824-
pg_options={
825-
'wal_level': 'replica'})
815+
initdb_params=['--data-checksums'])
826816

827817
self.init_pb(backup_dir)
828818
self.add_instance(backup_dir, 'node', node)
@@ -885,7 +875,6 @@ def test_drop_rel_during_backup_ptrack(self):
885875
set_replication=True,
886876
initdb_params=['--data-checksums'],
887877
pg_options={
888-
'wal_level': 'replica',
889878
'ptrack_enable': 'on'})
890879

891880
self.init_pb(backup_dir)
@@ -949,7 +938,6 @@ def test_persistent_slot_for_stream_backup(self):
949938
set_replication=True,
950939
initdb_params=['--data-checksums'],
951940
pg_options={
952-
'wal_level': 'replica',
953941
'max_wal_size': '40MB'})
954942

955943
self.init_pb(backup_dir)
@@ -984,14 +972,18 @@ def test_temp_slot_for_stream_backup(self):
984972
set_replication=True,
985973
initdb_params=['--data-checksums'],
986974
pg_options={
987-
'wal_level': 'replica',
988975
'max_wal_size': '40MB'})
989976

990977
self.init_pb(backup_dir)
991978
self.add_instance(backup_dir, 'node', node)
992979
self.set_archiving(backup_dir, 'node', node)
993980
node.slow_start()
994981

982+
# FULL backup
983+
self.backup_node(
984+
backup_dir, 'node', node,
985+
options=['--stream', '--temp-slot'])
986+
995987
if self.get_version(node) < self.version_to_num('10.0'):
996988
return unittest.skip('You need PostgreSQL >= 10 for this test')
997989
else:
@@ -1002,10 +994,5 @@ def test_temp_slot_for_stream_backup(self):
1002994
backup_dir, 'node', node,
1003995
options=['--stream', '--slot=slot_1', '--temp-slot'])
1004996

1005-
# FULL backup
1006-
self.backup_node(
1007-
backup_dir, 'node', node,
1008-
options=['--stream', '--temp-slot'])
1009-
1010997
# Clean after yourself
1011998
self.del_test_dir(module_name, fname)

0 commit comments

Comments
 (0)