summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2024-07-08 11:18:06 -0400
committerAndrew Dunstan <andrew@dunslane.net>2024-07-08 11:40:58 -0400
commit2e9dfa5e02e63732937fca270bbee77660401b04 (patch)
treeecf2ac88337b2e742eeb9724853237d15072d524
parent85242f9cbce2f9b8c728423a863037aa455e980f (diff)
Choose ports for test servers less likely to result in conflicts
If we choose ports in the range typically used for ephemeral ports there is a danger of encountering a port conflict due to a race condition between the time we choose the port in a range below that typically used to allocate ephemeral ports, but higher than the range typically used by well known services. Author: Jelte Fenema-Nio, with some editing by me. Discussion: https://postgr.es/m/d6ee8761-39d1-0033-1afb-d5a57ee056f2@gmail.com Backpatch to all live branches (12 and up)
-rw-r--r--src/test/perl/PostgreSQL/Test/Cluster.pm13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm
index 74592eba692..50160407bc2 100644
--- a/src/test/perl/PostgreSQL/Test/Cluster.pm
+++ b/src/test/perl/PostgreSQL/Test/Cluster.pm
@@ -127,6 +127,14 @@ our $min_compat = 12;
# list of file reservations made by get_free_port
my @port_reservation_files;
+# We want to choose a server port above the range that servers typically use
+# on Unix systems and below the range those systems typically use for ephemeral
+# client ports.
+# That way we minimize the risk of getting a port collision. These two values
+# are chosen to reflect that. We will always choose a port in this range.
+my $port_lower_bound = 10200;
+my $port_upper_bound = 32767;
+
INIT
{
@@ -151,7 +159,8 @@ INIT
$ENV{PGDATABASE} = 'postgres';
# Tracking of last port value assigned to accelerate free port lookup.
- $last_port_assigned = int(rand() * 16384) + 49152;
+ my $num_ports = $port_upper_bound - $port_lower_bound;
+ $last_port_assigned = int(rand() * $num_ports) + $port_lower_bound;
# Set the port lock directory
@@ -1516,7 +1525,7 @@ sub get_free_port
{
# advance $port, wrapping correctly around range end
- $port = 49152 if ++$port >= 65536;
+ $port = $port_lower_bound if ++$port > $port_upper_bound;
print "# Checking port $port\n";
# Check first that candidate port number is not included in