Use PG_TEST_TIMEOUT_DEFAULT in 019_replslot_limit.pl.

nmisch · nmisch · commit eaa1dd131ca0 · 2023-04-02T09:31:09.000-07:00
Oversight in f2698ea, which introduced the variable. This lowers some 1000s timeouts to the configurable default of 180s, due to a lack of evidence for needing the longer timeout. The alternative was 6*PG_TEST_TIMEOUT_DEFAULT, which we can adopt if the need arises. Given the lack of observed trouble with these timeouts, no back-patch.
diff --git a/src/test/recovery/t/019_replslot_limit.pl b/src/test/recovery/t/019_replslot_limit.pl
@@ -182,7 +182,7 @@
 	'ALTER SYSTEM RESET max_wal_size; SELECT pg_reload_conf()');
 $node_primary->safe_psql('postgres', "CHECKPOINT;");
 my $invalidated = 0;
-for (my $i = 0; $i < 10000; $i++)
+for (my $i = 0; $i < 10 * $PostgreSQL::Test::Utils::timeout_default; $i++)
 {
 	if (find_in_log(
 			$node_primary, 'invalidating obsolete replication slot "rep1"',
@@ -205,7 +205,7 @@
 
 # Wait until current checkpoint ends
 my $checkpoint_ended = 0;
-for (my $i = 0; $i < 10000; $i++)
+for (my $i = 0; $i < 10 * $PostgreSQL::Test::Utils::timeout_default; $i++)
 {
 	if (find_in_log($node_primary, "checkpoint complete: ", $logstart))
 	{
@@ -235,7 +235,7 @@
 $node_standby->start;
 
 my $failed = 0;
-for (my $i = 0; $i < 10000; $i++)
+for (my $i = 0; $i < 10 * $PostgreSQL::Test::Utils::timeout_default; $i++)
 {
 	if (find_in_log(
 			$node_standby,
@@ -353,8 +353,7 @@
 		stderr => \$stderr);
 	diag $stdout, $stderr;
 
-	# unlikely that the problem would resolve after 15s, so give up at point
-	if ($i++ == 150)
+	if ($i++ == 10 * $PostgreSQL::Test::Utils::timeout_default)
 	{
 		# An immediate shutdown may hide evidence of a locking bug. If
 		# retrying didn't resolve the issue, shut down in fast mode.
