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 AD7741FF16B for ; Tue, 29 Jul 2025 20:00:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 156F519F70; Tue, 29 Jul 2025 20:01:28 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Tue, 29 Jul 2025 20:00:58 +0200 Message-ID: <20250729180107.428855-19-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250729180107.428855-1-d.kral@proxmox.com> References: <20250729180107.428855-1-d.kral@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753812063890 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.013 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 Subject: [pve-devel] [PATCH ha-manager v4 18/19] env: add property delete for update_service_config X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Allow callees of update_service_config(...) to provide properties, which should be deleted from a HA resource config. This is needed for the migration of HA groups, as the 'group' property must be removed to completely migrate these to the respective HA resource configs. Otherwise, these groups would be reported as non-existant after the HA group config is removed. Signed-off-by: Daniel Kral --- src/PVE/HA/Env.pm | 4 ++-- src/PVE/HA/Env/PVE2.pm | 4 ++-- src/PVE/HA/Sim/Env.pm | 4 ++-- src/PVE/HA/Sim/Hardware.pm | 8 +++++++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/PVE/HA/Env.pm b/src/PVE/HA/Env.pm index 5cee7b30..70e39ad4 100644 --- a/src/PVE/HA/Env.pm +++ b/src/PVE/HA/Env.pm @@ -95,9 +95,9 @@ sub read_service_config { } sub update_service_config { - my ($self, $sid, $param) = @_; + my ($self, $sid, $param, $delete) = @_; - return $self->{plug}->update_service_config($sid, $param); + return $self->{plug}->update_service_config($sid, $param, $delete); } sub parse_sid { diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index 58fd36e3..854c8942 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -136,9 +136,9 @@ sub read_service_config { } sub update_service_config { - my ($self, $sid, $param) = @_; + my ($self, $sid, $param, $delete) = @_; - return PVE::HA::Config::update_resources_config($sid, $param); + return PVE::HA::Config::update_resources_config($sid, $param, $delete); } sub parse_sid { diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm index bb76b7fa..528ea3f8 100644 --- a/src/PVE/HA/Sim/Env.pm +++ b/src/PVE/HA/Sim/Env.pm @@ -210,9 +210,9 @@ sub read_service_config { } sub update_service_config { - my ($self, $sid, $param) = @_; + my ($self, $sid, $param, $delete) = @_; - return $self->{hardware}->update_service_config($sid, $param); + return $self->{hardware}->update_service_config($sid, $param, $delete); } sub parse_sid { diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm index 35107446..3a1ebf25 100644 --- a/src/PVE/HA/Sim/Hardware.pm +++ b/src/PVE/HA/Sim/Hardware.pm @@ -115,7 +115,7 @@ sub read_service_config { } sub update_service_config { - my ($self, $sid, $param) = @_; + my ($self, $sid, $param, $delete) = @_; my $conf = $self->read_service_config(); @@ -125,6 +125,12 @@ sub update_service_config { $sconf->{$k} = $param->{$k}; } + if ($delete) { + for my $k (PVE::Tools::split_list($delete)) { + delete $sconf->{$k}; + } + } + $self->write_service_config($conf); } -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel