PG-1867 Improve archiving test and fix race condition

jeltz · jeltz · commit 5975865f5fce · 2025-08-19T14:40:23.000+02:00
There was a race condition in the WAL archiving tests where if the
end-of-recovery checkpoint had completed the tests for the WAL contents
were non-sensical and racy. Solve this by explicilty promoting the
server first after we have looked at the WAL contents.

Additionally improve the tests by actually making sure the replica
starts in a good state where all WAL is encrypted.
diff --git a/contrib/pg_tde/t/wal_archiving.pl b/contrib/pg_tde/t/wal_archiving.pl
@@ -37,10 +37,26 @@
 	"SELECT pg_tde_set_server_key_using_global_key_provider('server-key', 'keyring');"
 );
 
+# This is a quite ugly dance to make sure the replica starts the state where
+# WAL encryption is enabled and also generate both some plaintext and some
+# encrypted WAL.
+#
+# We do this by taking the base backup while encryption is enabled. Then we
+# turn it off again to generate some plaintext WAL and turn it back on again
+# then generate some encrypted WAL.
+
 $primary->append_conf('postgresql.conf', "pg_tde.wal_encrypt = on");
 
+$primary->restart;
+
 $primary->backup('backup', backup_options => [ '-X', 'none' ]);
 
+$primary->append_conf('postgresql.conf', "pg_tde.wal_encrypt = off");
+
+$primary->restart;
+
+$primary->append_conf('postgresql.conf', "pg_tde.wal_encrypt = on");
+
 $primary->safe_psql('postgres',
 	"CREATE TABLE t1 AS SELECT 'foobar_plain' AS x");
 
@@ -79,20 +95,22 @@
 	"restore_command = 'pg_tde_restore_encrypt %f %p \"cp $archive_dir/%%f %%p\"'"
 );
 $replica->append_conf('postgresql.conf', "recovery_target_action = promote");
-$replica->set_recovery_mode;
+$replica->set_standby_mode;
 $replica->start;
 
 $data_dir = $replica->data_dir;
 
-like(
+unlike(
 	`strings $data_dir/pg_wal/0000000100000000000000??`,
 	qr/foobar_plain/,
-	'should find foobar_plain in WAL since we use the same key file');
+	'should not find foobar_plain in WAL since it is encrypted');
 unlike(
 	`strings $data_dir/pg_wal/0000000100000000000000??`,
 	qr/foobar_enc/,
 	'should not find foobar_enc in WAL since it is encrypted');
 
+$replica->promote;
+
 my $result = $replica->safe_psql('postgres',
 	'SELECT * FROM t1 UNION ALL SELECT * FROM t2');
 
