From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 99A877058D for ; Tue, 21 Jun 2022 17:21:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 937E57239 for ; Tue, 21 Jun 2022 17:20:59 +0200 (CEST) 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 id 4CE937229 for ; Tue, 21 Jun 2022 17:20:56 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 20AE343C3C for ; Tue, 21 Jun 2022 17:20:56 +0200 (CEST) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com Date: Tue, 21 Jun 2022 17:20:26 +0200 Message-Id: <20220621152026.496514-3-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621152026.496514-1-d.tschlatscher@proxmox.com> References: <20220621152026.496514-1-d.tschlatscher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.110 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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. [qemu.pm] Subject: [pve-devel] [PATCH qemu-server 1/1] make the timeout value editable when the VM is locked 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: , X-List-Received-Date: Tue, 21 Jun 2022 15:21:29 -0000 In some cases the VM could no longer start when the timeout value was set to a very low value and afterwards, for example, hibernated. In this case the VM is somewhat soft locked, because the API would not allow changing the timeout value anymore. (The only way out here would be to change the value manually in the config) Signed-off-by: Daniel Tschlatscher --- To make it possible to change the timeout config value when the VM is locked I created a function to tell whether the config should be editable or not. This reduces clutter in the already rather long invoking function. I also tried to keep it extensible for possible existing values that could be included here/are added in the future. Nonetheless, I am open to suggestions for a possibly more elegant solution with this function. Also, I am not quite sure about storing the "allowed" fields hardcoded in the function. But I also didn't find where a good place to store such a "constant" in this repository would be. PVE/API2/Qemu.pm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index db21fd8..f37baa4 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -8,6 +8,7 @@ use POSIX; use IO::Socket::IP; use URI::Escape; use Crypt::OpenSSL::Random; +use List::Util qw(first); use PVE::Cluster qw (cfs_read_file cfs_write_file);; use PVE::RRD; @@ -625,6 +626,28 @@ my $check_vm_modify_config_perm = sub { return 1; }; +# Certain fields should still be editable when the VM is locked +# For now, this means that only if those certain fields are edited/deleted will the result be true +sub skiplock_for_allowed_fields { + my ($param, @deleted) = @_; + + my @allowed = qw"timeout"; + my $skiplock = 1; + + my @to_check = @deleted; + for (keys %$param) { + push(@to_check, $_); + } + + my $idx = 0; + while ($skiplock && $idx < keys @to_check) { + $skiplock = first { $_ eq $to_check[$idx] } @allowed; + $idx++; + } + + return $skiplock; +} + __PACKAGE__->register_method({ name => 'vmlist', path => '', @@ -1455,7 +1478,9 @@ my $update_vm_api = sub { push @delete, 'runningcpu' if $conf->{runningcpu}; } - PVE::QemuConfig->check_lock($conf) if !$skiplock; + if (!$skiplock && !skiplock_for_allowed_fields($param, @delete)) { + PVE::QemuConfig->check_lock($conf); + } foreach my $opt (keys %$revert) { if (defined($conf->{$opt})) { -- 2.30.2