From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 1953099ED7
for <pve-devel@lists.proxmox.com>; Tue, 14 Nov 2023 15:02:10 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id F102F1C248
for <pve-devel@lists.proxmox.com>; Tue, 14 Nov 2023 15:02:09 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Tue, 14 Nov 2023 15:02:07 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 885B342999
for <pve-devel@lists.proxmox.com>; Tue, 14 Nov 2023 15:02:07 +0100 (CET)
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 14 Nov 2023 15:02:04 +0100
Message-Id: <20231114140204.27679-4-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231114140204.27679-1-f.ebner@proxmox.com>
References: <20231114140204.27679-1-f.ebner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.079 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [tools.pm]
Subject: [pve-devel] [RFC common 2/2] fix #4501: next unused port: work
around issue with too short expiretime
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 14 Nov 2023 14:02:10 -0000
For QEMU migration via TCP, there's a bit of time between port
reservation and usage, because currently, the port needs to be
reserved before doing a fork, where the systemd scope needs to be set
up and swtpm might need to be started before the QEMU binary can be
invoked and actually use the port.
To improve the situation, get the latest port recorded in the
reservation file and start trying from the next port, wrapping around
when hitting the end. Drastically reduces the chances to run into a
conflict, because after a given port reservation, all other ports are
tried first before returning to that port.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
src/PVE/Tools.pm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index 4d018e9..820229d 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -923,6 +923,11 @@ sub next_unused_port {
my $ports = {};
+ # Avoid that bulk actions compete for the first few ports by detecting the latest
+ # (previously) used port and start checking from there when trying to get a reservation.
+ my $latest_timestamp = 0;
+ my $latest_port = $range_end - 1;
+
if (my $fh = IO::File->new ($filename, "r")) {
while (my $line = <$fh>) {
if ($line =~ m/^(\d+)\s(\d+)$/) {
@@ -930,6 +935,14 @@ sub next_unused_port {
if (($timestamp + $expiretime) > $ctime) {
$ports->{$port} = $timestamp; # not expired
}
+ if (
+ $port >= $range_start
+ && $port < $range_end
+ && $timestamp > $latest_timestamp
+ ) {
+ $latest_timestamp = $timestamp;
+ $latest_port = $port;
+ }
}
}
}
@@ -942,7 +955,11 @@ sub next_unused_port {
GetAddrInfoFlags => 0);
$sockargs{LocalAddr} = $address if defined($address);
- for (my $p = $range_start; $p < $range_end; $p++) {
+ my $range = $range_end - $range_start;
+ for (my $offset = 1; $offset <= $range; $offset++) {
+ my $p = $latest_port + $offset;
+ $p -= $range if $p >= $range_end; # wrap around
+
next if $ports->{$p}; # reserved
$sockargs{LocalPort} = $p;
--
2.39.2