From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 78E561FF166 for ; Fri, 8 Nov 2024 02:47:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 87A7839D76; Fri, 8 Nov 2024 02:47:34 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Fri, 8 Nov 2024 14:46:15 +1300 In-Reply-To: References: MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Severen Redwood via pve-devel Precedence: list Cc: Severen Redwood , t.lamprecht@proxmox.com X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH manager v4 1/2] close #4369: api: optionally only suggest unique IDs Content-Type: multipart/mixed; boundary="===============9101721900640730092==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============9101721900640730092== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.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 BB2E5C1111 for ; Fri, 8 Nov 2024 02:47:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A2E1439AF8 for ; Fri, 8 Nov 2024 02:47:02 +0100 (CET) Received: from mx3.ext.sitehost.co.nz (mx3.ext.sitehost.co.nz [120.138.20.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 8 Nov 2024 02:47:01 +0100 (CET) Received: from localhost (extmx1-new.vps.sitehost.co.nz [127.0.0.1]) by mx3.ext.sitehost.co.nz (Postfix) with ESMTP id DA08D180B76; Fri, 8 Nov 2024 14:46:37 +1300 (NZDT) X-Virus-Scanned: SiteHost Virus/Spam Prevention on mx3.ext.sitehost.co.nz X-Spam-Flag: NO X-Spam-Score: -3.449 X-Spam-Status: No, score=-3.449 tagged_above=-100 required=5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, RP_MATCHES_RCVD=-0.55, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no Received: from mx3.ext.sitehost.co.nz ([127.0.0.1]) by localhost (mx3.ext.sitehost.co.nz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x4mgmvQf1_Uv; Fri, 8 Nov 2024 14:46:33 +1300 (NZDT) Received: from yggdrasill.. (oep.nct.sitehost.co.nz [120.138.23.30]) by mx3.ext.sitehost.co.nz (Postfix) with ESMTPSA id ABE5F180575; Fri, 8 Nov 2024 14:46:32 +1300 (NZDT) From: Severen Redwood To: pve-devel@lists.proxmox.com Cc: a.lauterer@proxmox.com, t.lamprecht@proxmox.com, Severen Redwood , Daniel Krambrock Subject: [PATCH manager v4 1/2] close #4369: api: optionally only suggest unique IDs Date: Fri, 8 Nov 2024 14:46:15 +1300 Message-ID: <20241108014620.73352-1-severen.redwood@sitehost.co.nz> X-Mailer: git-send-email 2.47.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_PASS -0.1 DMARC pass policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record At the moment, the `/cluster/nextid` API endpoint will return the lowest available VM/CT ID, which means that it will suggest re-using VM IDs. This can be undesirable, so add an optional check to ensure that it chooses an ID which is not and has never been in use. This optional behaviour is enabled when `unique-next-id: 1` in the data centre config, and the previously used IDs are tracked as a list in the file `/etc/pve/used_vmids.list`. Co-authored-by: Daniel Krambrock Signed-off-by: Severen Redwood Tested-by: Aaron Lauterer Reviewed-by: Aaron Lauterer --- Changed since v3 is addressing some comments on style in `$read_id_list`. PVE/API2/Cluster.pm | 13 +++++++-- PVE/Makefile | 1 + PVE/UsedVmidList.pm | 70 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 PVE/UsedVmidList.pm diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm index c2a7a946..a3e89484 100644 --- a/PVE/API2/Cluster.pm +++ b/PVE/API2/Cluster.pm @@ -20,6 +20,7 @@ use PVE::RPCEnvironment; use PVE::SafeSyslog; use PVE::Storage; use PVE::Tools qw(extract_param); +use PVE::UsedVmidList; use PVE::API2::ACMEAccount; use PVE::API2::ACMEPlugin; @@ -866,12 +867,20 @@ __PACKAGE__->register_method({ my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg'); my $next_id = $dc_conf->{'next-id'} // {}; + my $want_unique = $dc_conf->{'unique-next-id'} // 0; my $lower = $next_id->{lower} // 100; my $upper = $next_id->{upper} // (1000 * 1000); # note, lower than the schema-maximum - for (my $i = $lower; $i < $upper; $i++) { - return $i if !defined($idlist->{$i}); + if ($want_unique) { + my $used_ids = PVE::Cluster::cfs_read_file('used_vmids.list'); + for (my $i = $lower; $i < $upper; $i++) { + return $i if !defined($idlist->{$i}) and !defined($used_ids->{$i}); + } + } else { + for (my $i = $lower; $i < $upper; $i++) { + return $i if !defined($idlist->{$i}); + } } die "unable to get any free VMID in range [$lower, $upper]\n"; diff --git a/PVE/Makefile b/PVE/Makefile index efcb250d..29775e78 100644 --- a/PVE/Makefile +++ b/PVE/Makefile @@ -15,6 +15,7 @@ PERLSOURCE = \ NodeConfig.pm \ PullMetric.pm \ Report.pm \ + UsedVmidList.pm \ VZDump.pm all: pvecfg.pm $(SUBDIRS) diff --git a/PVE/UsedVmidList.pm b/PVE/UsedVmidList.pm new file mode 100644 index 00000000..0d0a885d --- /dev/null +++ b/PVE/UsedVmidList.pm @@ -0,0 +1,70 @@ +package PVE::UsedVmidList; + +use strict; +use warnings; + +use PVE::Cluster; + +my $read_id_list = sub { + my ($filename, $raw) = @_; + + return {} if !defined($raw); + + my $used_ids = {}; + my @lines = split(/\n/, $raw); + foreach my $line (@lines) { + if ($line =~ m/^(\d+)$/) { + $used_ids->{$1} = 1; + } elsif ($line =~ m/^(\d+)-(\d+)$/) { + foreach my $id ($1..$2) { + $used_ids->{$id} = 1; + } + } else { + warn "Skipping invalid entry in used_vmids.list: $line\n"; + } + } + + return $used_ids; +}; + +my $write_id_list = sub { + my ($filename, $used_ids) = @_; + my @used_ids = sort {$a <=> $b} keys(%$used_ids); + + my @lines; + my $len = scalar(@used_ids); + for (my $i = 0; $i < $len; $i++) { + my $line = "$used_ids[$i]"; + + my $j = $i; + while ($j + 1 < $len and $used_ids[$j] + 1 == $used_ids[$j + 1]) { + $j++; + } + + # If we find a range of consecutive IDs, write $ids[$i]-$ids[$j] to + # denote the range so that we avoid storing each individual integer. + if ($i != $j) { + $line .= "-$used_ids[$j]"; + } + + $i = $j; + push(@lines, $line); + } + + return join("\n", @lines) . "\n"; +}; + +PVE::Cluster::cfs_register_file('used_vmids.list', $read_id_list, $write_id_list); + +sub add_vmid { + my ($vmid) = @_; + + PVE::Cluster::cfs_lock_file('used_vmids.list', 10, sub { + my $used_ids = PVE::Cluster::cfs_read_file('used_vmids.list'); + + $used_ids->{$vmid} = 1; + PVE::Cluster::cfs_write_file('used_vmids.list', $used_ids); + }); +} + +1; -- 2.47.0 --===============9101721900640730092== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============9101721900640730092==--