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

Commitc8642d9

Browse files
committed
PostgresNode: Add names to nodes
This makes the log files easier to follow when investigating a testfailure.Author: Michael PaquierReview: Noah Misch
1 parent216d568 commitc8642d9

20 files changed

+48
-37
lines changed

‎src/bin/pg_basebackup/t/010_pg_basebackup.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
my$tempdir = TestLib::tempdir;
1414

15-
my$node = get_new_node();
15+
my$node = get_new_node('main');
1616

1717
# Initialize node without replication settings
1818
$node->init(hba_permit_replication=> 0);

‎src/bin/pg_controldata/t/001_pg_controldata.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
command_fails(['pg_controldata','nonexistent' ],
1212
'pg_controldata with nonexistent directory fails');
1313

14-
my$node = get_new_node();
14+
my$node = get_new_node('main');
1515
$node->init;
1616

1717
command_like(['pg_controldata',$node->data_dir ],

‎src/bin/pg_ctl/t/002_status.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
command_exit_is(['pg_ctl','status','-D',"$tempdir/nonexistent" ],
1212
4,'pg_ctl status with nonexistent directory');
1313

14-
my$node = get_new_node();
14+
my$node = get_new_node('main');
1515
$node->init;
1616

1717
command_exit_is(['pg_ctl','status','-D',$node->data_dir ],

‎src/bin/pg_rewind/RewindTest.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ sub setup_cluster
116116
{
117117

118118
# Initialize master, data checksums are mandatory
119-
$node_master = get_new_node();
119+
$node_master = get_new_node('master');
120120
$node_master->init;
121121

122122
# Custom parameters for master's postgresql.conf
@@ -144,7 +144,7 @@ sub start_master
144144

145145
subcreate_standby
146146
{
147-
$node_standby = get_new_node();
147+
$node_standby = get_new_node('standby');
148148
$node_master->backup('my_backup');
149149
$node_standby->init_from_backup($node_master,'my_backup');
150150
my$connstr_master =$node_master->connstr('postgres');

‎src/bin/scripts/t/010_clusterdb.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
program_version_ok('clusterdb');
1010
program_options_handling_ok('clusterdb');
1111

12-
my$node = get_new_node();
12+
my$node = get_new_node('main');
1313
$node->init;
1414
$node->start;
1515

‎src/bin/scripts/t/011_clusterdb_all.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use TestLib;
66
use Test::Moretests=> 2;
77

8-
my$node = get_new_node();
8+
my$node = get_new_node('main');
99
$node->init;
1010
$node->start;
1111

‎src/bin/scripts/t/020_createdb.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
program_version_ok('createdb');
1010
program_options_handling_ok('createdb');
1111

12-
my$node = get_new_node();
12+
my$node = get_new_node('main');
1313
$node->init;
1414
$node->start;
1515

‎src/bin/scripts/t/030_createlang.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
program_version_ok('createlang');
1010
program_options_handling_ok('createlang');
1111

12-
my$node = get_new_node();
12+
my$node = get_new_node('main');
1313
$node->init;
1414
$node->start;
1515

‎src/bin/scripts/t/040_createuser.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
program_version_ok('createuser');
1010
program_options_handling_ok('createuser');
1111

12-
my$node = get_new_node();
12+
my$node = get_new_node('main');
1313
$node->init;
1414
$node->start;
1515

‎src/bin/scripts/t/050_dropdb.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
program_version_ok('dropdb');
1010
program_options_handling_ok('dropdb');
1111

12-
my$node = get_new_node();
12+
my$node = get_new_node('main');
1313
$node->init;
1414
$node->start;
1515

‎src/bin/scripts/t/060_droplang.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
program_version_ok('droplang');
1010
program_options_handling_ok('droplang');
1111

12-
my$node = get_new_node();
12+
my$node = get_new_node('main');
1313
$node->init;
1414
$node->start;
1515

‎src/bin/scripts/t/070_dropuser.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
program_version_ok('dropuser');
1010
program_options_handling_ok('dropuser');
1111

12-
my$node = get_new_node();
12+
my$node = get_new_node('main');
1313
$node->init;
1414
$node->start;
1515

‎src/bin/scripts/t/080_pg_isready.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
command_fails(['pg_isready'],'fails with no server running');
1313

14-
my$node = get_new_node();
14+
my$node = get_new_node('main');
1515
$node->init;
1616
$node->start;
1717

‎src/bin/scripts/t/090_reindexdb.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
program_version_ok('reindexdb');
1010
program_options_handling_ok('reindexdb');
1111

12-
my$node = get_new_node();
12+
my$node = get_new_node('main');
1313
$node->init;
1414
$node->start;
1515

‎src/bin/scripts/t/091_reindexdb_all.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use PostgresNode;
55
use Test::Moretests=> 2;
66

7-
my$node = get_new_node();
7+
my$node = get_new_node('main');
88
$node->init;
99
$node->start;
1010

‎src/bin/scripts/t/100_vacuumdb.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
program_version_ok('vacuumdb');
1010
program_options_handling_ok('vacuumdb');
1111

12-
my$node = get_new_node();
12+
my$node = get_new_node('main');
1313
$node->init;
1414
$node->start;
1515

‎src/bin/scripts/t/101_vacuumdb_all.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use PostgresNode;
55
use Test::Moretests=> 2;
66

7-
my$node = get_new_node();
7+
my$node = get_new_node('main');
88
$node->init;
99
$node->start;
1010

‎src/bin/scripts/t/102_vacuumdb_stages.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use PostgresNode;
55
use Test::Moretests=> 4;
66

7-
my$node = get_new_node();
7+
my$node = get_new_node('main');
88
$node->init;
99
$node->start;
1010

‎src/test/perl/PostgresNode.pm

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ INIT
4343
subnew
4444
{
4545
my$class =shift;
46+
my$name =shift;
4647
my$pghost =shift;
4748
my$pgport =shift;
4849
my$testname = basename($0);
@@ -51,8 +52,8 @@ sub new
5152
_port=>$pgport,
5253
_host=>$pghost,
5354
_basedir=> TestLib::tempdir,
54-
_applname=>"node_$pgport",
55-
_logfile=>"$TestLib::log_path/${testname}_node_${pgport}.log" };
55+
_name=>$name,
56+
_logfile=>"$TestLib::log_path/${testname}_${name}.log" };
5657

5758
bless$self,$class;
5859
$self->dump_info;
@@ -78,10 +79,10 @@ sub basedir
7879
return$self->{_basedir};
7980
}
8081

81-
subapplname
82+
subname
8283
{
8384
my ($self) =@_;
84-
return$self->{_applname};
85+
return$self->{_name};
8586
}
8687

8788
sublogfile
@@ -127,11 +128,11 @@ sub backup_dir
127128
subdump_info
128129
{
129130
my ($self) =@_;
131+
print"Name:" .$self->name ."\n";
130132
print"Data directory:" .$self->data_dir ."\n";
131133
print"Backup directory:" .$self->backup_dir ."\n";
132134
print"Archive directory:" .$self->archive_dir ."\n";
133135
print"Connection string:" .$self->connstr ."\n";
134-
print"Application name:" .$self->applname ."\n";
135136
print"Log file:" .$self->logfile ."\n";
136137
}
137138

@@ -178,7 +179,7 @@ sub init
178179
TestLib::system_or_bail($ENV{PG_REGRESS},'--config-auth',$pgdata);
179180

180181
openmy$conf,">>$pgdata/postgresql.conf";
181-
print$conf"\n# Added by PostgresNode.pm)\n";
182+
print$conf"\n# Added by PostgresNode.pm\n";
182183
print$conf"fsync = off\n";
183184
print$conf"log_statement = all\n";
184185
print$conf"port =$port\n";
@@ -210,8 +211,9 @@ sub backup
210211
my ($self,$backup_name) =@_;
211212
my$backup_path =$self->backup_dir .'/' .$backup_name;
212213
my$port =$self->port;
214+
my$name =$self->name;
213215

214-
print"# Taking backup$backup_name from nodewith port$port\n";
216+
print"# Taking backup$backup_name from node\"$name\"\n";
215217
TestLib::system_or_bail("pg_basebackup -D$backup_path -p$port -x");
216218
print"# Backup finished\n";
217219
}
@@ -221,11 +223,13 @@ sub init_from_backup
221223
my ($self,$root_node,$backup_name) =@_;
222224
my$backup_path =$root_node->backup_dir .'/' .$backup_name;
223225
my$port =$self->port;
224-
my$root_port =$root_node->port;
226+
my$node_name =$self->name;
227+
my$root_name =$root_node->name;
225228

226229
print
227-
"Initializing node$port from backup\"$backup_name\" of node$root_port\n";
228-
die"Backup$backup_path does not exist"unless-d$backup_path;
230+
"# Initializing node\"$node_name\" from backup\"$backup_name\" of node\"$root_name\"\n";
231+
die"Backup\"$backup_name\" does not exist at$backup_path"
232+
unless-d$backup_path;
229233

230234
mkdir$self->backup_dir;
231235
mkdir$self->archive_dir;
@@ -249,7 +253,8 @@ sub start
249253
my ($self) =@_;
250254
my$port =$self->port;
251255
my$pgdata =$self->data_dir;
252-
print("### Starting test server in$pgdata\n");
256+
my$name =$self->name;
257+
print("### Starting node\"$name\"\n");
253258
my$ret = TestLib::system_log('pg_ctl','-w','-D',$self->data_dir,'-l',
254259
$self->logfile,'start');
255260

@@ -261,16 +266,16 @@ sub start
261266
}
262267

263268
$self->_update_pid;
264-
265269
}
266270

267271
substop
268272
{
269273
my ($self,$mode) =@_;
270274
my$port =$self->port;
271275
my$pgdata =$self->data_dir;
276+
my$name =$self->name;
272277
$mode ='fast'if (!defined($mode));
273-
print"### Stopping nodein$pgdata with port$port using mode$mode\n";
278+
print"### Stopping node\"$name\" using mode$mode\n";
274279
TestLib::system_log('pg_ctl','-D',$pgdata,'-m',$mode,'stop');
275280
$self->{_pid} =undef;
276281
$self->_update_pid;
@@ -282,6 +287,8 @@ sub restart
282287
my$port =$self->port;
283288
my$pgdata =$self->data_dir;
284289
my$logfile =$self->logfile;
290+
my$name =$self->name;
291+
print"### Restarting node\"$name\"\n";
285292
TestLib::system_log('pg_ctl','-D',$pgdata,'-w','-l',$logfile,
286293
'restart');
287294
$self->_update_pid;
@@ -290,14 +297,15 @@ sub restart
290297
sub_update_pid
291298
{
292299
my$self =shift;
300+
my$name =$self->name;
293301

294302
# If we can open the PID file, read its first line and that's the PID we
295303
# want. If the file cannot be opened, presumably the server is not
296304
# running; don't be noisy in that case.
297305
if (openmy$pidfile,$self->data_dir ."/postmaster.pid")
298306
{
299307
chomp($self->{_pid} = <$pidfile>);
300-
print"# Postmaster PID is$self->{_pid}\n";
308+
print"# Postmaster PIDfor node\"$name\"is$self->{_pid}\n";
301309
close$pidfile;
302310
return;
303311
}
@@ -316,6 +324,7 @@ sub _update_pid
316324
# for another node even when this one is not active.
317325
subget_new_node
318326
{
327+
my$name =shift;
319328
my$found = 0;
320329
my$port =$last_port_assigned;
321330

@@ -340,7 +349,7 @@ sub get_new_node
340349
print"# Found free port$port\n";
341350

342351
# Lock port number found by creating a new node
343-
my$node = new PostgresNode($test_pghost,$port);
352+
my$node = new PostgresNode($name,$test_pghost,$port);
344353

345354
# Add node to list of nodes
346355
push(@all_nodes,$node);
@@ -354,8 +363,9 @@ sub get_new_node
354363
subDESTROY
355364
{
356365
my$self =shift;
366+
my$name =$self->name;
357367
returnifnotdefined$self->{_pid};
358-
print"# signalling QUIT to$self->{_pid}\n";
368+
print"### Signalling QUIT to$self->{_pid} for node\"$name\"\n";
359369
TestLib::system_log('pg_ctl','kill','QUIT',$self->{_pid});
360370
}
361371

@@ -371,7 +381,8 @@ sub psql
371381
my ($self,$dbname,$sql) =@_;
372382

373383
my ($stdout,$stderr);
374-
print("# Running SQL command:$sql\n");
384+
my$name =$self->name;
385+
print("### Running SQL command on node\"$name\":$sql\n");
375386

376387
IPC::Run::run ['psql','-XAtq','-d',$self->connstr($dbname),'-f',
377388
'-' ],'<', \$sql,'>', \$stdout,'2>', \$stderr

‎src/test/ssl/t/001_ssltests.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ sub test_connect_fails
7474
#### Part 0. Set up the server.
7575

7676
diag"setting up data directory...";
77-
my$node = get_new_node();
77+
my$node = get_new_node('master');
7878
$node->init;
7979

8080
# PGHOST is enforced here to set up the node, subsequent connections

0 commit comments

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