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

Commit803466b

Browse files
committed
Avoid picking already-bound TCP ports in kerberos and ldap test suites.
src/test/kerberos and src/test/ldap need to run a private authenticationserver of the relevant type, for which they need a free TCP port.They were just picking a random port number in 48K-64K, which worksexcept when something's already using the particular port. Notably,the probability of failure rises dramatically if one simply runs thosetests in a tight loop, because each test cycle leaves behind a bunch ofhigh ports that are transiently in TIME_WAIT state.To fix, split out the code that PostgresNode.pm already had foridentifying a free TCP port number, so that it can be invoked to choosea port for the KDC or LDAP server. This isn't 100% bulletproof, sinceconceivably something else on the machine could grab the port betweenthe time we check and the time we actually start the server. But that'sa pretty short window, so in practice this should be good enough.Back-patch to v11 where these test suites were added.Patch by me, reviewed by Andrew Dunstan.Discussion:https://postgr.es/m/3397.1564872168@sss.pgh.pa.us
1 parent489247b commit803466b

File tree

3 files changed

+86
-48
lines changed

3 files changed

+86
-48
lines changed

‎src/test/kerberos/t/001_auth.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
my$kdc_conf ="${TestLib::tmp_check}/kdc.conf";
7070
my$krb5_log ="${TestLib::tmp_check}/krb5libs.log";
7171
my$kdc_log ="${TestLib::tmp_check}/krb5kdc.log";
72-
my$kdc_port =int(rand() * 16384) + 49152;
72+
my$kdc_port =get_free_port();
7373
my$kdc_datadir ="${TestLib::tmp_check}/krb5kdc";
7474
my$kdc_pidfile ="${TestLib::tmp_check}/krb5kdc.pid";
7575
my$keytab ="${TestLib::tmp_check}/krb5.keytab";

‎src/test/ldap/t/001_auth.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
my$slapd_logfile ="${TestLib::tmp_check}/slapd.log";
5656
my$ldap_conf ="${TestLib::tmp_check}/ldap.conf";
5757
my$ldap_server ='localhost';
58-
my$ldap_port =int(rand() * 16384) + 49152;
58+
my$ldap_port =get_free_port();
5959
my$ldaps_port =$ldap_port + 1;
6060
my$ldap_url ="ldap://$ldap_server:$ldap_port";
6161
my$ldaps_url ="ldaps://$ldap_server:$ldaps_port";

‎src/test/perl/PostgresNode.pm

Lines changed: 84 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ PostgresNode - class representing PostgreSQL server instance
6363
# Stop the server
6464
$node->stop('fast');
6565
66+
# Find a free, unprivileged TCP port to bind some other service to
67+
my $port = get_free_port();
68+
6669
=head1DESCRIPTION
6770
6871
PostgresNode contains a set of routines able to work on a PostgreSQL node,
@@ -102,6 +105,7 @@ use Scalar::Util qw(blessed);
102105

103106
our@EXPORT =qw(
104107
get_new_node
108+
get_free_port
105109
);
106110

107111
our ($use_tcp,$test_localhost,$test_pghost,$last_host_assigned,
@@ -1071,9 +1075,68 @@ sub get_new_node
10711075
my$class ='PostgresNode';
10721076
$class =shiftifscalar(@_) % 2 != 1;
10731077
my ($name,%params) =@_;
1074-
my$port_is_forced =defined$params{port};
1075-
my$found =$port_is_forced;
1076-
my$port =$port_is_forced ?$params{port} :$last_port_assigned;
1078+
1079+
# Select a port.
1080+
my$port;
1081+
if (defined$params{port})
1082+
{
1083+
$port =$params{port};
1084+
}
1085+
else
1086+
{
1087+
# When selecting a port, we look for an unassigned TCP port number,
1088+
# even if we intend to use only Unix-domain sockets. This is clearly
1089+
# necessary on $use_tcp (Windows) configurations, and it seems like a
1090+
# good idea on Unixen as well.
1091+
$port = get_free_port();
1092+
}
1093+
1094+
# Select a host.
1095+
my$host =$test_pghost;
1096+
if ($params{own_host})
1097+
{
1098+
if ($use_tcp)
1099+
{
1100+
$last_host_assigned++;
1101+
$last_host_assigned > 254and BAIL_OUT("too many own_host nodes");
1102+
$host ='127.0.0.' .$last_host_assigned;
1103+
}
1104+
else
1105+
{
1106+
$host ="$test_pghost/$name";# Assume $name =~ /^[-_a-zA-Z0-9]+$/
1107+
mkdir$host;
1108+
}
1109+
}
1110+
1111+
# Lock port number found by creating a new node
1112+
my$node =$class->new($name,$host,$port);
1113+
1114+
# Add node to list of nodes
1115+
push(@all_nodes,$node);
1116+
1117+
return$node;
1118+
}
1119+
1120+
=pod
1121+
1122+
=itemget_free_port()
1123+
1124+
Locate an unprivileged (high) TCP port that's not currently bound to
1125+
anything. This is used by get_new_node, and is also exported for use
1126+
by test cases that need to start other, non-Postgres servers.
1127+
1128+
Ports assigned to existing PostgresNode objects are automatically
1129+
excluded, even if those servers are not currently running.
1130+
1131+
XXX A port available now may become unavailable by the time we start
1132+
the desired service.
1133+
1134+
=cut
1135+
1136+
subget_free_port
1137+
{
1138+
my$found = 0;
1139+
my$port =$last_port_assigned;
10771140

10781141
while ($found == 0)
10791142
{
@@ -1090,63 +1153,38 @@ sub get_new_node
10901153
$found = 0if ($node->port ==$port);
10911154
}
10921155

1093-
# Check to see if anything else is listening on this TCP port. This
1094-
# is *necessary* on $use_tcp (Windows) configurations. Seek a port
1095-
# available for all possible listen_addresses values, for own_host
1096-
# nodes and so the caller can harness this port for the widest range
1097-
# of purposes. The 0.0.0.0 test achieves that for post-2006 Cygwin,
1098-
# which automatically sets SO_EXCLUSIVEADDRUSE. The same holds for
1099-
# MSYS (a Cygwin fork). Testing 0.0.0.0 is insufficient for Windows
1100-
# native Perl (https://stackoverflow.com/a/14388707), so we also test
1156+
# Check to see if anything else is listening on this TCP port.
1157+
# Seek a port available for all possible listen_addresses values,
1158+
# so callers can harness this port for the widest range of purposes.
1159+
# The 0.0.0.0 test achieves that for post-2006 Cygwin, which
1160+
# automatically sets SO_EXCLUSIVEADDRUSE. The same holds for MSYS (a
1161+
# Cygwin fork). Testing 0.0.0.0 is insufficient for Windows native
1162+
# Perl (https://stackoverflow.com/a/14388707), so we also test
11011163
# individual addresses.
11021164
#
1103-
# This seems like a good idea on Unixen as well, even though we don't
1104-
# ask the postmaster to open a TCP port on Unix. On Non-Linux,
1105-
# non-Windows kernels, binding to 127.0.0.1/24 addresses other than
1106-
# 127.0.0.1 might fail with EADDRNOTAVAIL. Binding to 0.0.0.0 is
1107-
# unnecessary on non-Windows systems.
1108-
#
1109-
# XXX A port available now may become unavailable by the time we start
1110-
# the postmaster.
1165+
# On non-Linux, non-Windows kernels, binding to 127.0.0/24 addresses
1166+
# other than 127.0.0.1 might fail with EADDRNOTAVAIL. Binding to
1167+
# 0.0.0.0 is unnecessary on non-Windows systems.
11111168
if ($found == 1)
11121169
{
11131170
foreachmy$addr (qw(127.0.0.1),
11141171
$use_tcp ?qw(127.0.0.2 127.0.0.3 0.0.0.0) : ())
11151172
{
1116-
can_bind($addr,$port)or$found = 0;
1173+
if (!can_bind($addr,$port))
1174+
{
1175+
$found = 0;
1176+
last;
1177+
}
11171178
}
11181179
}
11191180
}
11201181

11211182
print"# Found port$port\n";
11221183

1123-
# Select a host.
1124-
my$host =$test_pghost;
1125-
if ($params{own_host})
1126-
{
1127-
if ($use_tcp)
1128-
{
1129-
$last_host_assigned++;
1130-
$last_host_assigned > 254and BAIL_OUT("too many own_host nodes");
1131-
$host ='127.0.0.' .$last_host_assigned;
1132-
}
1133-
else
1134-
{
1135-
$host ="$test_pghost/$name";# Assume $name =~ /^[-_a-zA-Z0-9]+$/
1136-
mkdir$host;
1137-
}
1138-
}
1139-
1140-
# Lock port number found by creating a new node
1141-
my$node =$class->new($name,$host,$port);
1142-
1143-
# Add node to list of nodes
1144-
push(@all_nodes,$node);
1184+
# Update port for next time
1185+
$last_port_assigned =$port;
11451186

1146-
# And update port for next time
1147-
$port_is_forcedor$last_port_assigned =$port;
1148-
1149-
return$node;
1187+
return$port;
11501188
}
11511189

11521190
# Internal routine to check whether a host:port is available to bind

0 commit comments

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