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 455AA90887 for ; Thu, 22 Sep 2022 15:54:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 25F8619EDD for ; Thu, 22 Sep 2022 15:54:24 +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 for ; Thu, 22 Sep 2022 15:54:23 +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 4C97F4456F for ; Thu, 22 Sep 2022 15:54:23 +0200 (CEST) Date: Thu, 22 Sep 2022 15:54:22 +0200 From: Wolfgang Bumiller To: Stefan Hanreich Cc: pve-devel@lists.proxmox.com Message-ID: <20220922135422.h4ss4f6qlcm42tdb@casey.proxmox.com> References: <20220922131943.4066317-1-s.hanreich@proxmox.com> <20220922131943.4066317-4-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220922131943.4066317-4-s.hanreich@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.263 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 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: Re: [pve-devel] [PATCH qemu-server 1/1] Add pre/post-restore hooks to VMs 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: Thu, 22 Sep 2022 13:54:54 -0000 On Thu, Sep 22, 2022 at 03:19:43PM +0200, Stefan Hanreich wrote: > Signed-off-by: Stefan Hanreich > --- > > There might be a better way to differentiate the different errors from > restorefn in the error handling logic, although I think in this case it is > still fine. This might get a bit messy though if in the future someone adds > another source for errors. Maybe add a single if before the restored_data checks > instead? > > PVE/API2/Qemu.pm | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm > index 3ec31c2..fe41634 100644 > --- a/PVE/API2/Qemu.pm > +++ b/PVE/API2/Qemu.pm > @@ -884,9 +884,13 @@ __PACKAGE__->register_method({ > die "$emsg $@" if $@; > > my $restored_data = 0; > + my $hook_executed = 0; > my $restorefn = sub { > my $conf = PVE::QemuConfig->load_config($vmid); > > + PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'pre-restore', 1); > + $hook_executed = 1; > + > PVE::QemuConfig->check_protection($conf, $emsg); This should probalby happen before the hook? > > die "$emsg vm is running\n" if PVE::QemuServer::check_running($vmid); > @@ -918,6 +922,8 @@ __PACKAGE__->register_method({ > eval { PVE::QemuServer::template_create($vmid, $restored_conf) }; > warn $@ if $@; > } > + > + PVE::GuestHelpers::exec_hookscript($restored_conf, $vmid, 'post-restore'); > }; > > # ensure no old replication state are exists > @@ -1012,10 +1018,10 @@ __PACKAGE__->register_method({ > if (my $err = $@) { > eval { PVE::QemuConfig->remove_lock($vmid, 'create') }; > warn $@ if $@; > - if ($restored_data) { > + if ($hook_executed && $restored_data) { > warn "error after data was restored, VM disks should be OK but config may " > ."require adaptions. VM $vmid state is NOT cleaned up.\n"; > - } else { > + } elsif ($hook_executed && !$restored_data) { > warn "error before or during data restore, some or all disks were not " > ."completely restored. VM $vmid state is NOT cleaned up.\n"; > } > -- > 2.30.2