Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit239dcf8

Browse files
committed
Honor TEMP_CONFIG in TAP suites.
The buildfarm client uses TEMP_CONFIG to implement its extra_configsetting. Except for stats_temp_directory, extra_config now applies toTAP suites; extra_config values seen in the past month are compatiblewith this. Back-patch to 9.6, where PostgresNode was introduced, so thebuildfarm can rely on it sooner.Reviewed by Andrew Dunstan and Tom Lane.Discussion:https://postgr.es/m/20181229021950.GA3302966@rfd.leadboat.com
1 parente16ab40 commit239dcf8

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

‎src/bin/pg_ctl/t/001_start_stop.pl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
'configure authentication');
2525
openmy$conf,'>>',"$tempdir/data/postgresql.conf";
2626
print$conf"fsync = off\n";
27+
print$conf TestLib::slurp_file($ENV{TEMP_CONFIG})
28+
ifdefined$ENV{TEMP_CONFIG};
2729
if (!$windows_os)
2830
{
2931
print$conf"listen_addresses = ''\n";

‎src/test/perl/PostgresNode.pm

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,17 @@ sub init
452452
print$conf"log_statement = all\n";
453453
print$conf"log_replication_commands = on\n";
454454
print$conf"wal_retrieve_retry_interval = '500ms'\n";
455-
print$conf"port =$port\n";
455+
456+
# If a setting tends to affect whether tests pass or fail, print it after
457+
# TEMP_CONFIG. Otherwise, print it before TEMP_CONFIG, thereby permitting
458+
# overrides. Settings that merely improve performance or ease debugging
459+
# belong before TEMP_CONFIG.
460+
print$conf TestLib::slurp_file($ENV{TEMP_CONFIG})
461+
ifdefined$ENV{TEMP_CONFIG};
462+
463+
# XXX Neutralize any stats_temp_directory in TEMP_CONFIG. Nodes running
464+
# concurrently must not share a stats_temp_directory.
465+
print$conf"stats_temp_directory = 'pg_stat_tmp'\n";
456466

457467
if ($params{allows_streaming})
458468
{
@@ -478,6 +488,7 @@ sub init
478488
print$conf"max_wal_senders = 0\n";
479489
}
480490

491+
print$conf"port =$port\n";
481492
if ($use_tcp)
482493
{
483494
print$conf"unix_socket_directories = ''\n";

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp