[pve-devel] [PATCH qemu-server 1/1] Add pre/post-restore hooks to VMs
Wolfgang Bumiller
w.bumiller at proxmox.com
Thu Sep 22 15:54:22 CEST 2022
On Thu, Sep 22, 2022 at 03:19:43PM +0200, Stefan Hanreich wrote:
> Signed-off-by: Stefan Hanreich <s.hanreich at proxmox.com>
> ---
>
> 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
More information about the pve-devel
mailing list