From c877607c5a0f2878fb9e28e93a40e5be22d7eb6c Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 28 May 2026 16:17:06 -0400 Subject: [PATCH v6a 4/5] smaller segsize for tests --- meson.build | 3 ++- contrib/test_decoding/expected/ddl.out | 2 +- contrib/test_decoding/sql/ddl.sql | 3 +-- src/test/perl/PostgreSQL/Test/Cluster.pm | 1 + src/test/recovery/t/039_end_of_wal.pl | 3 ++- src/test/recovery/t/051_effective_wal_level.pl | 2 +- src/test/regress/pg_regress.c | 2 +- src/Makefile.global.in | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 20b887f1a1b..b7a42e4373a 100644 --- a/meson.build +++ b/meson.build @@ -3927,7 +3927,8 @@ sys.exit(sp.returncode) test_initdb_template, temp_install_bindir / 'initdb', '--auth', 'trust', '--no-sync', '--no-instructions', '--lc-messages=C', - '--no-clean' + '--no-clean', + '--wal-segsize=1', ], priority: setup_tests_priority - 1, timeout: 300, diff --git a/contrib/test_decoding/expected/ddl.out b/contrib/test_decoding/expected/ddl.out index 6819812e806..30a1877a76f 100644 --- a/contrib/test_decoding/expected/ddl.out +++ b/contrib/test_decoding/expected/ddl.out @@ -58,7 +58,7 @@ SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_d SELECT slot_name, plugin, slot_type, active, NOT catalog_xmin IS NULL AS catalog_xmin_set, xmin IS NULl AS data_xmin_not_set, - pg_wal_lsn_diff(restart_lsn, '0/01000000') > 0 AS some_wal + pg_wal_lsn_diff(restart_lsn, '0/00000001') > 0 AS some_wal FROM pg_replication_slots; slot_name | plugin | slot_type | active | catalog_xmin_set | data_xmin_not_set | some_wal -----------------+---------------+-----------+--------+------------------+-------------------+---------- diff --git a/contrib/test_decoding/sql/ddl.sql b/contrib/test_decoding/sql/ddl.sql index 6d0b7d77778..ba250e5d529 100644 --- a/contrib/test_decoding/sql/ddl.sql +++ b/contrib/test_decoding/sql/ddl.sql @@ -22,14 +22,13 @@ SELECT 'init' FROM pg_create_physical_replication_slot('repl'); SELECT data FROM pg_logical_slot_get_changes('repl', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1'); SELECT pg_drop_replication_slot('repl'); - SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding'); /* check whether status function reports us, only reproduceable columns */ SELECT slot_name, plugin, slot_type, active, NOT catalog_xmin IS NULL AS catalog_xmin_set, xmin IS NULl AS data_xmin_not_set, - pg_wal_lsn_diff(restart_lsn, '0/01000000') > 0 AS some_wal + pg_wal_lsn_diff(restart_lsn, '0/00000001') > 0 AS some_wal FROM pg_replication_slots; /* diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm index 4fcb1f6be56..5c74a8b690a 100644 --- a/src/test/perl/PostgreSQL/Test/Cluster.pm +++ b/src/test/perl/PostgreSQL/Test/Cluster.pm @@ -671,6 +671,7 @@ sub init 'initdb', '--no-sync', '--pgdata' => $pgdata, '--auth' => 'trust', + '--wal-segsize' => '1', @{ $params{extra} }); } else diff --git a/src/test/recovery/t/039_end_of_wal.pl b/src/test/recovery/t/039_end_of_wal.pl index f46d089a0fb..af6a6ced73d 100644 --- a/src/test/recovery/t/039_end_of_wal.pl +++ b/src/test/recovery/t/039_end_of_wal.pl @@ -112,7 +112,8 @@ sub build_page_header # set to "minimal" avoids random standby snapshot records. Autovacuum # could also trigger randomly, generating random WAL activity of its own. my $node = PostgreSQL::Test::Cluster->new("node"); -$node->init; +$node->init(extra=>['--wal-segsize=16']); + $node->append_conf( 'postgresql.conf', q[wal_level = minimal diff --git a/src/test/recovery/t/051_effective_wal_level.pl b/src/test/recovery/t/051_effective_wal_level.pl index c862073c34e..6329947a33f 100644 --- a/src/test/recovery/t/051_effective_wal_level.pl +++ b/src/test/recovery/t/051_effective_wal_level.pl @@ -34,7 +34,7 @@ sub wait_for_logical_decoding_disabled # Initialize the primary server with wal_level = 'replica'. my $primary = PostgreSQL::Test::Cluster->new('primary'); -$primary->init(allows_streaming => 1); +$primary->init(allows_streaming => 1, extra=>['--wal-segsize=16']); $primary->append_conf('postgresql.conf', "log_min_messages = debug1"); $primary->start(); diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 1c052cc0fbf..23f9dfe781f 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -2410,7 +2410,7 @@ regression_main(int argc, char *argv[], note("initializing database system by running initdb"); appendStringInfo(&cmd, - "\"%s%sinitdb\" -D \"%s/data\" --no-clean --no-sync", + "\"%s%sinitdb\" -D \"%s/data\" --no-clean --no-sync --wal-segsize=1", bindir ? bindir : "", bindir ? "/" : "", temp_instance); diff --git a/src/Makefile.global.in b/src/Makefile.global.in index cef1ad7f87d..f529bacc4b2 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -442,7 +442,7 @@ ifeq ($(MAKELEVEL),0) $(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1 $(MAKE) -j1 $(if $(CHECKPREP_TOP),-C $(CHECKPREP_TOP),) checkprep >>'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1 - $(with_temp_install) initdb --auth trust --no-sync --no-instructions --lc-messages=C --no-clean '$(abs_top_builddir)'/tmp_install/initdb-template >>'$(abs_top_builddir)'/tmp_install/log/initdb-template.log 2>&1 + $(with_temp_install) initdb --auth trust --no-sync --no-instructions --lc-messages=C --no-clean --wal-segsize=1 '$(abs_top_builddir)'/tmp_install/initdb-template >>'$(abs_top_builddir)'/tmp_install/log/initdb-template.log 2>&1 endif endif endif -- 2.54.0.380.gc69baaf57b