[PATCH manager 1/2] close #4369: api: optionally only suggest unique IDs
Severen Redwood
severen.redwood at sitehost.co.nz
Thu Sep 26 15:52:28 CEST 2024
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 <krambrock at hrz.uni-marburg.de>
Signed-off-by: Severen Redwood <severen.redwood at sitehost.co.nz>
---
PVE/API2/Cluster.pm | 12 ++++++++--
PVE/Makefile | 1 +
PVE/UsedVmidList.pm | 55 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 66 insertions(+), 2 deletions(-)
create mode 100644 PVE/UsedVmidList.pm
diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm
index 04387ab4..304b5595 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;
@@ -813,12 +814,19 @@ __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) {
+ for (my $i = $lower; $i < $upper; $i++) {
+ return $i if !defined($idlist->{$i}) and !PVE::UsedVmidList::is_on_vmid_list($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..c1751729
--- /dev/null
+++ b/PVE/UsedVmidList.pm
@@ -0,0 +1,55 @@
+package PVE::UsedVmidList;
+
+use strict;
+use warnings;
+
+use PVE::Cluster;
+
+my $parse_vmid_list = sub {
+ my ($filename, $raw) = @_;
+
+ return [] if !defined($raw);
+
+ my @parsed;
+ my @lines = split(/\n/, $raw);
+ foreach my $line (@lines) {
+ next if $line =~ m/^\s*$/;
+
+ if ($line =~ m/^(\d+)$/) {
+ push(@parsed, $1);
+ } else {
+ warn "Skipping invalid used_vmids.list entry: $line\n";
+ }
+ }
+
+ return \@parsed;
+};
+
+my $write_vmid_list = sub {
+ my ($filename, @data) = @_;
+
+ return join("\n", @data) . "\n";
+};
+
+PVE::Cluster::cfs_register_file('used_vmids.list', $parse_vmid_list, $write_vmid_list);
+
+sub add_vmid {
+ my ($vmid) = @_;
+
+ PVE::Cluster::cfs_lock_file('used_vmids.list', 10, sub {
+ my $vmid_list = PVE::Cluster::cfs_read_file('used_vmids.list');
+
+ if (!is_on_vmid_list($vmid)) {
+ push(@$vmid_list, $vmid);
+ PVE::Cluster::cfs_write_file('used_vmids.list', join("\n", @$vmid_list));
+ }
+ });
+}
+
+sub is_on_vmid_list {
+ my ($vmid) = @_;
+ my $vmid_list = PVE::Cluster::cfs_read_file('used_vmids.list');
+ return scalar(grep { $_ == $vmid } @$vmid_list);
+}
+
+1;
--
2.46.2
More information about the pve-devel
mailing list