Put back explicit setting of replication values within TAP tests.

tglsfdc · tglsfdc · commit 26f4c14d7bcf · 2020-10-01T10:59:20.000-04:00
Commit 151c0c5 neglected the possibility that a TEMP_CONFIG file would explicitly set max_wal_senders=0; as indeed buildfarm member thorntail does, so that it can test wal_level=minimal in other test suites. Hence, rather than assuming that max_wal_senders=10 will prevail if we say nothing, set it explicitly. Set max_replication_slots=10 explicitly too, just to be safe. Back-patch to v10, like the previous patch. Discussion: https://postgr.es/m/723911.1601417626@sss.pgh.pa.us
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
@@ -443,13 +443,16 @@ sub init
 		{
 			print $conf "wal_level = replica\n";
 		}
+		print $conf "max_wal_senders = 10\n";
+		print $conf "max_replication_slots = 10\n";
 		print $conf "wal_keep_segments = 20\n";
-		print $conf "max_wal_size = 128MB\n";
 		print $conf "wal_log_hints = on\n";
 		print $conf "hot_standby = on\n";
 		# conservative settings to ensure we can run multiple postmasters:
 		print $conf "shared_buffers = 1MB\n";
 		print $conf "max_connections = 20\n";
+		# limit disk space consumption, too:
+		print $conf "max_wal_size = 128MB\n";
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -443,13 +443,16 @@ sub init`
`443`	`443`	`{`
`444`	`444`	`print $conf "wal_level = replica\n";`
`445`	`445`	`}`
	`446`	`+ print $conf "max_wal_senders = 10\n";`
	`447`	`+ print $conf "max_replication_slots = 10\n";`
`446`	`448`	`print $conf "wal_keep_segments = 20\n";`
`447`		`- print $conf "max_wal_size = 128MB\n";`
`448`	`449`	`print $conf "wal_log_hints = on\n";`
`449`	`450`	`print $conf "hot_standby = on\n";`
`450`	`451`	`# conservative settings to ensure we can run multiple postmasters:`
`451`	`452`	`print $conf "shared_buffers = 1MB\n";`
`452`	`453`	`print $conf "max_connections = 20\n";`
	`454`	`+ # limit disk space consumption, too:`
	`455`	`+ print $conf "max_wal_size = 128MB\n";`
`453`	`456`	`}`
`454`	`457`	`else`
`455`	`458`	`{`