Skip to content

Commit dbf0273

Browse files
gsmolkgsmolk
authored
Merge pull request #389 from postgrespro/autovacuum_off
tests: disable autovacuum by default
2 parents f840ae4 + d3bbb74 commit dbf0273

16 files changed

+134
-335
lines changed

‎tests/archive.py

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,6 @@ def test_basic_master_and_replica_concurrent_archiving(self):
903903
initdb_params=['--data-checksums'],
904904
pg_options={
905905
'checkpoint_timeout': '30s',
906-
'autovacuum': 'off',
907906
'archive_timeout': '10s'})
908907

909908
replica = self.make_simple_node(
@@ -1002,8 +1001,7 @@ def test_concurrent_archiving(self):
10021001
master = self.make_simple_node(
10031002
base_dir=os.path.join(module_name, fname, 'master'),
10041003
set_replication=True,
1005-
initdb_params=['--data-checksums'],
1006-
pg_options={'autovacuum': 'off'})
1004+
initdb_params=['--data-checksums'])
10071005

10081006
self.init_pb(backup_dir)
10091007
self.add_instance(backup_dir, 'node', master)
@@ -1235,8 +1233,7 @@ def test_archive_catalog(self):
12351233
initdb_params=['--data-checksums'],
12361234
pg_options={
12371235
'archive_timeout': '30s',
1238-
'checkpoint_timeout': '30s',
1239-
'autovacuum': 'off'})
1236+
'checkpoint_timeout': '30s'})
12401237

12411238
if self.get_version(master) < self.version_to_num('9.6.0'):
12421239
self.del_test_dir(module_name, fname)
@@ -1558,8 +1555,7 @@ def test_archive_catalog_1(self):
15581555
initdb_params=['--data-checksums'],
15591556
pg_options={
15601557
'archive_timeout': '30s',
1561-
'checkpoint_timeout': '30s',
1562-
'autovacuum': 'off'})
1558+
'checkpoint_timeout': '30s'})
15631559

15641560
self.init_pb(backup_dir)
15651561
self.add_instance(backup_dir, 'node', node)
@@ -1614,8 +1610,7 @@ def test_archive_catalog_2(self):
16141610
initdb_params=['--data-checksums'],
16151611
pg_options={
16161612
'archive_timeout': '30s',
1617-
'checkpoint_timeout': '30s',
1618-
'autovacuum': 'off'})
1613+
'checkpoint_timeout': '30s'})
16191614

16201615
self.init_pb(backup_dir)
16211616
self.add_instance(backup_dir, 'node', node)
@@ -1811,8 +1806,7 @@ def test_hexadecimal_timeline(self):
18111806
node = self.make_simple_node(
18121807
base_dir=os.path.join(module_name, fname, 'node'),
18131808
set_replication=True,
1814-
initdb_params=['--data-checksums'],
1815-
pg_options={'autovacuum': 'off'})
1809+
initdb_params=['--data-checksums'])
18161810

18171811
self.init_pb(backup_dir)
18181812
self.add_instance(backup_dir, 'node', node)
@@ -1875,7 +1869,6 @@ def test_archiving_and_slots(self):
18751869
set_replication=True,
18761870
initdb_params=['--data-checksums'],
18771871
pg_options={
1878-
'autovacuum': 'off',
18791872
'checkpoint_timeout': '30s',
18801873
'max_wal_size': '64MB'})
18811874

@@ -2008,8 +2001,7 @@ def test_archive_pg_receivexlog_partial_handling(self):
20082001
node = self.make_simple_node(
20092002
base_dir=os.path.join(module_name, fname, 'node'),
20102003
set_replication=True,
2011-
initdb_params=['--data-checksums'],
2012-
pg_options={'autovacuum': 'off'})
2004+
initdb_params=['--data-checksums'])
20132005

20142006
self.init_pb(backup_dir)
20152007
self.add_instance(backup_dir, 'node', node)
@@ -2098,8 +2090,7 @@ def test_multi_timeline_recovery_prefetching(self):
20982090
node = self.make_simple_node(
20992091
base_dir=os.path.join(module_name, fname, 'node'),
21002092
set_replication=True,
2101-
initdb_params=['--data-checksums'],
2102-
pg_options={'autovacuum': 'off'})
2093+
initdb_params=['--data-checksums'])
21032094

21042095
self.init_pb(backup_dir)
21052096
self.add_instance(backup_dir, 'node', node)
@@ -2214,8 +2205,7 @@ def test_archive_get_batching_sanity(self):
22142205
node = self.make_simple_node(
22152206
base_dir=os.path.join(module_name, fname, 'node'),
22162207
set_replication=True,
2217-
initdb_params=['--data-checksums'],
2218-
pg_options={'autovacuum': 'off'})
2208+
initdb_params=['--data-checksums'])
22192209

22202210
if self.get_version(node) < self.version_to_num('9.6.0'):
22212211
self.del_test_dir(module_name, fname)
@@ -2287,8 +2277,7 @@ def test_archive_get_prefetch_corruption(self):
22872277
node = self.make_simple_node(
22882278
base_dir=os.path.join(module_name, fname, 'node'),
22892279
set_replication=True,
2290-
initdb_params=['--data-checksums'],
2291-
pg_options={'autovacuum': 'off'})
2280+
initdb_params=['--data-checksums'])
22922281

22932282
self.init_pb(backup_dir)
22942283
self.add_instance(backup_dir, 'node', node)

‎tests/backup.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,8 +1401,7 @@ def test_drop_rel_during_backup_page(self):
14011401
node = self.make_simple_node(
14021402
base_dir=os.path.join(module_name, fname, 'node'),
14031403
set_replication=True,
1404-
initdb_params=['--data-checksums'],
1405-
pg_options={'autovacuum': 'off'})
1404+
initdb_params=['--data-checksums'])
14061405

14071406
self.init_pb(backup_dir)
14081407
self.add_instance(backup_dir, 'node', node)
@@ -1660,8 +1659,7 @@ def test_pg_11_adjusted_wal_segment_size(self):
16601659
'--data-checksums',
16611660
'--wal-segsize=64'],
16621661
pg_options={
1663-
'min_wal_size': '128MB',
1664-
'autovacuum': 'off'})
1662+
'min_wal_size': '128MB'})
16651663

16661664
self.init_pb(backup_dir)
16671665
self.add_instance(backup_dir, 'node', node)
@@ -2576,9 +2574,7 @@ def test_issue_132(self):
25762574
node = self.make_simple_node(
25772575
base_dir=os.path.join(module_name, fname, 'node'),
25782576
set_replication=True,
2579-
initdb_params=['--data-checksums'],
2580-
pg_options={
2581-
'autovacuum': 'off'})
2577+
initdb_params=['--data-checksums'])
25822578

25832579
self.init_pb(backup_dir)
25842580
self.add_instance(backup_dir, 'node', node)
@@ -2616,9 +2612,7 @@ def test_issue_132_1(self):
26162612
node = self.make_simple_node(
26172613
base_dir=os.path.join(module_name, fname, 'node'),
26182614
set_replication=True,
2619-
initdb_params=['--data-checksums'],
2620-
pg_options={
2621-
'autovacuum': 'off'})
2615+
initdb_params=['--data-checksums'])
26222616

26232617
# TODO: check version of old binary, it should be 2.1.4, 2.1.5 or 2.2.1
26242618

@@ -2963,8 +2957,7 @@ def test_issue_203(self):
29632957
node = self.make_simple_node(
29642958
base_dir=os.path.join(module_name, fname, 'node'),
29652959
set_replication=True,
2966-
initdb_params=['--data-checksums'],
2967-
pg_options={'autovacuum': 'off'})
2960+
initdb_params=['--data-checksums'])
29682961

29692962
self.init_pb(backup_dir)
29702963
self.add_instance(backup_dir, 'node', node)
@@ -3004,8 +2997,7 @@ def test_issue_231(self):
30042997
node = self.make_simple_node(
30052998
base_dir=os.path.join(module_name, fname, 'node'),
30062999
set_replication=True,
3007-
initdb_params=['--data-checksums'],
3008-
pg_options={'autovacuum': 'off'})
3000+
initdb_params=['--data-checksums'])
30093001

30103002
self.init_pb(backup_dir)
30113003
self.add_instance(backup_dir, 'node', node)

‎tests/compatibility.py

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ def test_backward_compatibility_page(self):
1919
node = self.make_simple_node(
2020
base_dir=os.path.join(module_name, fname, 'node'),
2121
set_replication=True,
22-
initdb_params=['--data-checksums'],
23-
pg_options={
24-
'autovacuum': 'off'})
22+
initdb_params=['--data-checksums'])
2523

2624
self.init_pb(backup_dir, old_binary=True)
2725
self.show_pb(backup_dir)
@@ -156,8 +154,7 @@ def test_backward_compatibility_delta(self):
156154
node = self.make_simple_node(
157155
base_dir=os.path.join(module_name, fname, 'node'),
158156
set_replication=True,
159-
initdb_params=['--data-checksums'],
160-
pg_options={'autovacuum': 'off'})
157+
initdb_params=['--data-checksums'])
161158

162159
self.init_pb(backup_dir, old_binary=True)
163160
self.show_pb(backup_dir)
@@ -296,9 +293,7 @@ def test_backward_compatibility_ptrack(self):
296293
base_dir=os.path.join(module_name, fname, 'node'),
297294
set_replication=True,
298295
ptrack_enable=True,
299-
initdb_params=['--data-checksums'],
300-
pg_options={
301-
'autovacuum': 'off'})
296+
initdb_params=['--data-checksums'])
302297

303298
self.init_pb(backup_dir, old_binary=True)
304299
self.show_pb(backup_dir)
@@ -408,9 +403,7 @@ def test_backward_compatibility_compression(self):
408403
node = self.make_simple_node(
409404
base_dir=os.path.join(module_name, fname, 'node'),
410405
set_replication=True,
411-
initdb_params=['--data-checksums'],
412-
pg_options={
413-
'autovacuum': 'off'})
406+
initdb_params=['--data-checksums'])
414407

415408
self.init_pb(backup_dir, old_binary=True)
416409
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -572,9 +565,7 @@ def test_backward_compatibility_merge(self):
572565
node = self.make_simple_node(
573566
base_dir=os.path.join(module_name, fname, 'node'),
574567
set_replication=True,
575-
initdb_params=['--data-checksums'],
576-
pg_options={
577-
'autovacuum': 'off'})
568+
initdb_params=['--data-checksums'])
578569

579570
self.init_pb(backup_dir, old_binary=True)
580571
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -630,8 +621,7 @@ def test_backward_compatibility_merge_1(self):
630621
node = self.make_simple_node(
631622
base_dir=os.path.join(module_name, fname, 'node'),
632623
set_replication=True,
633-
initdb_params=['--data-checksums'],
634-
pg_options={'autovacuum': 'off'})
624+
initdb_params=['--data-checksums'])
635625

636626
self.init_pb(backup_dir, old_binary=True)
637627
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -703,8 +693,7 @@ def test_backward_compatibility_merge_2(self):
703693
node = self.make_simple_node(
704694
base_dir=os.path.join(module_name, fname, 'node'),
705695
set_replication=True,
706-
initdb_params=['--data-checksums'],
707-
pg_options={'autovacuum': 'off'})
696+
initdb_params=['--data-checksums'])
708697

709698
self.init_pb(backup_dir, old_binary=True)
710699
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -826,8 +815,7 @@ def test_backward_compatibility_merge_3(self):
826815
node = self.make_simple_node(
827816
base_dir=os.path.join(module_name, fname, 'node'),
828817
set_replication=True,
829-
initdb_params=['--data-checksums'],
830-
pg_options={'autovacuum': 'off'})
818+
initdb_params=['--data-checksums'])
831819

832820
self.init_pb(backup_dir, old_binary=True)
833821
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -953,8 +941,7 @@ def test_backward_compatibility_merge_4(self):
953941
node = self.make_simple_node(
954942
base_dir=os.path.join(module_name, fname, 'node'),
955943
set_replication=True,
956-
initdb_params=['--data-checksums'],
957-
pg_options={'autovacuum': 'off'})
944+
initdb_params=['--data-checksums'])
958945

959946
self.init_pb(backup_dir, old_binary=True)
960947
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -1036,8 +1023,7 @@ def test_backward_compatibility_merge_5(self):
10361023
node = self.make_simple_node(
10371024
base_dir=os.path.join(module_name, fname, 'node'),
10381025
set_replication=True,
1039-
initdb_params=['--data-checksums'],
1040-
pg_options={'autovacuum': 'off'})
1026+
initdb_params=['--data-checksums'])
10411027

10421028
self.init_pb(backup_dir, old_binary=True)
10431029
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -1112,8 +1098,7 @@ def test_page_vacuum_truncate(self):
11121098
node = self.make_simple_node(
11131099
base_dir=os.path.join(module_name, fname, 'node'),
11141100
set_replication=True,
1115-
initdb_params=['--data-checksums'],
1116-
pg_options={'autovacuum': 'off'})
1101+
initdb_params=['--data-checksums'])
11171102

11181103
self.init_pb(backup_dir, old_binary=True)
11191104
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -1217,8 +1202,7 @@ def test_page_vacuum_truncate_compression(self):
12171202
node = self.make_simple_node(
12181203
base_dir=os.path.join(module_name, fname, 'node'),
12191204
set_replication=True,
1220-
initdb_params=['--data-checksums'],
1221-
pg_options={'autovacuum': 'off'})
1205+
initdb_params=['--data-checksums'])
12221206

12231207
self.init_pb(backup_dir, old_binary=True)
12241208
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -1297,8 +1281,7 @@ def test_page_vacuum_truncate_compressed_1(self):
12971281
node = self.make_simple_node(
12981282
base_dir=os.path.join(module_name, fname, 'node'),
12991283
set_replication=True,
1300-
initdb_params=['--data-checksums'],
1301-
pg_options={'autovacuum': 'off'})
1284+
initdb_params=['--data-checksums'])
13021285

13031286
self.init_pb(backup_dir, old_binary=True)
13041287
self.add_instance(backup_dir, 'node', node, old_binary=True)
@@ -1403,8 +1386,7 @@ def test_hidden_files(self):
14031386
node = self.make_simple_node(
14041387
base_dir=os.path.join(module_name, fname, 'node'),
14051388
set_replication=True,
1406-
initdb_params=['--data-checksums'],
1407-
pg_options={'autovacuum': 'off'})
1389+
initdb_params=['--data-checksums'])
14081390

14091391
self.init_pb(backup_dir, old_binary=True)
14101392
self.add_instance(backup_dir, 'node', node, old_binary=True)

0 commit comments

Comments
 (0)