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

Commit4ab02e8

Browse files
committed
Test both 0.0.0.0 and 127.0.0.x addresses to find a usable port.
Commitc098509 changedPostgresNode::get_new_node() to probe 0.0.0.0 instead of 127.0.0.1, butthe new test was less effective for Windows native Perl. This increasedthe failure rate of buildfarm members bowerbird and jacana. Instead,test 0.0.0.0 and concrete addresses. This restores the old level ofdefense, but the algorithm is still subject to its longstanding time ofcheck to time of use race condition. Back-patch to 9.6, like theprevious change.Discussion:https://postgr.es/m/GrdLgAdUK9FdyZg8VIcTDKVOkys122ZINEb3CjjoySfGj2KyPiMKTh1zqtRp0TAD7FJ27G-OBB3eplxIB5GhcQH5o8zzGZfp0MuJaXJxVxk=@yesql.se
1 parentd9f543e commit4ab02e8

File tree

1 file changed

+41
-21
lines changed

1 file changed

+41
-21
lines changed

‎src/test/perl/PostgresNode.pm

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,27 +1088,30 @@ sub get_new_node
10881088
$found = 0if ($node->port ==$port);
10891089
}
10901090

1091-
# Check to see if anything else is listening on this TCP port. Accept
1092-
# only ports available for all possible listen_addresses values, so
1093-
# the caller can harness this port for the widest range of purposes.
1094-
# This is *necessary* on Windows, and seems like a good idea on Unixen
1095-
# as well, even though we don't ask the postmaster to open a TCP port
1096-
# on Unix.
1091+
# Check to see if anything else is listening on this TCP port. This
1092+
# is *necessary* on $use_tcp (Windows) configurations. Seek a port
1093+
# available for all possible listen_addresses values, for own_host
1094+
# nodes and so the caller can harness this port for the widest range
1095+
# of purposes. The 0.0.0.0 test achieves that for post-2006 Cygwin,
1096+
# which automatically sets SO_EXCLUSIVEADDRUSE. The same holds for
1097+
# MSYS (a Cygwin fork). Testing 0.0.0.0 is insufficient for Windows
1098+
# native Perl (https://stackoverflow.com/a/14388707), so we also test
1099+
# individual addresses.
1100+
#
1101+
# This seems like a good idea on Unixen as well, even though we don't
1102+
# ask the postmaster to open a TCP port on Unix. On Non-Linux,
1103+
# non-Windows kernels, binding to 127.0.0.1/24 addresses other than
1104+
# 127.0.0.1 fails with EADDRNOTAVAIL.
1105+
#
1106+
# XXX A port available now may become unavailable by the time we start
1107+
# the postmaster.
10971108
if ($found == 1)
10981109
{
1099-
my$iaddr = inet_aton('0.0.0.0');
1100-
my$paddr = sockaddr_in($port,$iaddr);
1101-
my$proto =getprotobyname("tcp");
1102-
1103-
socket(SOCK, PF_INET, SOCK_STREAM,$proto)
1104-
ordie"socket failed:$!";
1105-
1106-
# As in postmaster, don't use SO_REUSEADDR on Windows
1107-
setsockopt(SOCK, SOL_SOCKET, SO_REUSEADDR,pack("l", 1))
1108-
unless$TestLib::windows_os;
1109-
(bind(SOCK,$paddr) &&listen(SOCK, SOMAXCONN))
1110-
or$found = 0;
1111-
close(SOCK);
1110+
foreachmy$addr (qw(127.0.0.1 0.0.0.0),
1111+
$use_tcp ?qw(127.0.0.2 127.0.0.3) : ())
1112+
{
1113+
can_bind($addr,$port)or$found = 0;
1114+
}
11121115
}
11131116
}
11141117

@@ -1120,8 +1123,6 @@ sub get_new_node
11201123
{
11211124
if ($use_tcp)
11221125
{
1123-
# This assumes $use_tcp platforms treat every address in
1124-
# 127.0.0.1/24, not just 127.0.0.1, as a usable loopback.
11251126
$last_host_assigned++;
11261127
$last_host_assigned > 254and BAIL_OUT("too many own_host nodes");
11271128
$host ='127.0.0.' .$last_host_assigned;
@@ -1145,6 +1146,25 @@ sub get_new_node
11451146
return$node;
11461147
}
11471148

1149+
# Internal routine to check whether a host:port is available to bind
1150+
subcan_bind
1151+
{
1152+
my ($host,$port) =@_;
1153+
my$iaddr = inet_aton($host);
1154+
my$paddr = sockaddr_in($port,$iaddr);
1155+
my$proto =getprotobyname("tcp");
1156+
1157+
socket(SOCK, PF_INET, SOCK_STREAM,$proto)
1158+
ordie"socket failed:$!";
1159+
1160+
# As in postmaster, don't use SO_REUSEADDR on Windows
1161+
setsockopt(SOCK, SOL_SOCKET, SO_REUSEADDR,pack("l", 1))
1162+
unless$TestLib::windows_os;
1163+
my$ret =bind(SOCK,$paddr) &&listen(SOCK, SOMAXCONN);
1164+
close(SOCK);
1165+
return$ret;
1166+
}
1167+
11481168
# Retain the errno on die() if set, else assume a generic errno of 1.
11491169
# This will instruct the END handler on how to handle artifacts left
11501170
# behind from tests.

0 commit comments

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