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 9817869C81; Wed, 3 Mar 2021 10:57:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8BA7C3473B; Wed, 3 Mar 2021 10:57:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 DB10234703; Wed, 3 Mar 2021 10:57:24 +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 696054586C; Wed, 3 Mar 2021 10:57:24 +0100 (CET) From: Stefan Reiter To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Wed, 3 Mar 2021 10:56:11 +0100 Message-Id: <20210303095612.7475-11-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210303095612.7475-1-s.reiter@proxmox.com> References: <20210303095612.7475-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.025 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pbs-devel] [PATCH v2 qemu-server 10/11] live-restore: register qmeventd handle X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Mar 2021 09:57:56 -0000 Similar to backups, prevent QEMU from being killed by qmeventd during the live-restore, so a guest can shut itself down without aborting the restore operation. Note that the 'close' is only to be explicit, the handle will also be closed in case an operation errors (i.e. when the 'eval' is left). Signed-off-by: Stefan Reiter --- v2: * unchanged PVE/QemuServer.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index e420de3..233441e 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6356,6 +6356,8 @@ sub pbs_live_restore { {}, ); + my $qmeventd_fd = register_qmeventd_handle($vmid); + # begin streaming, i.e. data copy from PBS to target disk for every vol, # this will effectively collapse the backing image chain consisting of # [target <- alloc-track -> PBS snapshot] to just [target] (alloc-track @@ -6377,6 +6379,8 @@ sub pbs_live_restore { foreach my $ds (keys %$restored_disks) { mon_cmd($vmid, 'blockdev-del', 'node-name' => "$ds-pbs"); } + + close($qmeventd_fd); }; my $err = $@; -- 2.20.1