public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server v5 19/32] backup: implement restore for external providers
Date: Fri, 21 Mar 2025 14:48:39 +0100	[thread overview]
Message-ID: <20250321134852.103871-20-f.ebner@proxmox.com> (raw)
In-Reply-To: <20250321134852.103871-1-f.ebner@proxmox.com>

First, the provider is asked about what restore mechanism to use.
Currently, only 'qemu-img' is possible. Then the configuration files
are restored, the provider gives information about volumes contained
in the backup and finally the volumes are restored via
'qemu-img convert'.

The code for the restore_external_archive() function was copied and
adapted from the restore_proxmox_backup_archive() function. Together
with restore_vma_archive() it seems sensible to extract the common
parts and use a dedicated module for restore code.

The parse_restore_archive() helper was renamed, because it's not just
parsing.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/API2/Qemu.pm  |  30 +++++++++-
 PVE/QemuServer.pm | 139 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+), 3 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 156b1c7b..6c7c1d0d 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -927,7 +927,7 @@ __PACKAGE__->register_method({
 	return $res;
     }});
 
-my $parse_restore_archive = sub {
+my $classify_restore_archive = sub {
     my ($storecfg, $archive) = @_;
 
     my ($archive_storeid, $archive_volname) = PVE::Storage::parse_volume_id($archive, 1);
@@ -941,6 +941,22 @@ my $parse_restore_archive = sub {
 	    $res->{type} = 'pbs';
 	    return $res;
 	}
+	if (PVE::Storage::storage_has_feature($storecfg, $archive_storeid, 'backup-provider')) {
+	    my $log_function = sub {
+		my ($log_level, $message) = @_;
+		my $prefix = $log_level eq 'err' ? 'ERROR' : uc($log_level);
+		print "$prefix: $message\n";
+	    };
+	    my $backup_provider = PVE::Storage::new_backup_provider(
+		$storecfg,
+		$archive_storeid,
+		$log_function,
+	    );
+
+	    $res->{type} = 'external';
+	    $res->{'backup-provider'} = $backup_provider;
+	    return $res;
+	}
     }
     my $path = PVE::Storage::abs_filesystem_path($storecfg, $archive);
     $res->{type} = 'file';
@@ -1101,7 +1117,7 @@ __PACKAGE__->register_method({
 		    'backup',
 		);
 
-		$archive = $parse_restore_archive->($storecfg, $archive);
+		$archive = $classify_restore_archive->($storecfg, $archive);
 	    }
 	}
 
@@ -1160,7 +1176,15 @@ __PACKAGE__->register_method({
 			PVE::QemuServer::check_restore_permissions($rpcenv, $authuser, $merged);
 		    }
 		}
-		if ($archive->{type} eq 'file' || $archive->{type} eq 'pipe') {
+		if (my $backup_provider = $archive->{'backup-provider'}) {
+		    PVE::QemuServer::restore_external_archive(
+			$backup_provider,
+			$archive->{volid},
+			$vmid,
+			$authuser,
+			$restore_options,
+		    );
+		} elsif ($archive->{type} eq 'file' || $archive->{type} eq 'pipe') {
 		    die "live-restore is only compatible with backup images from a Proxmox Backup Server\n"
 			if $live_restore;
 		    PVE::QemuServer::restore_file_archive($archive->{path} // '-', $vmid, $authuser, $restore_options);
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index ffd5d56b..cb8447c9 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -7175,6 +7175,145 @@ sub restore_proxmox_backup_archive {
     }
 }
 
+sub restore_external_archive {
+    my ($backup_provider, $archive, $vmid, $user, $options) = @_;
+
+    die "live restore from backup provider is not implemented\n" if $options->{live};
+
+    my $storecfg = PVE::Storage::config();
+
+    my ($storeid, $volname) = PVE::Storage::parse_volume_id($archive);
+    my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
+
+    my $tmpdir = "/run/qemu-server/vzdumptmp$$";
+    rmtree($tmpdir);
+    mkpath($tmpdir) or die "unable to create $tmpdir\n";
+
+    my $conffile = PVE::QemuConfig->config_file($vmid);
+    # disable interrupts (always do cleanups)
+    local $SIG{INT} =
+	local $SIG{TERM} =
+	local $SIG{QUIT} =
+	local $SIG{HUP} = sub { print STDERR "got interrupt - ignored\n"; };
+
+    # Note: $oldconf is undef if VM does not exists
+    my $cfs_path = PVE::QemuConfig->cfs_config_path($vmid);
+    my $oldconf = PVE::Cluster::cfs_read_file($cfs_path);
+    my $new_conf_raw = '';
+
+    my $rpcenv = PVE::RPCEnvironment::get();
+    my $devinfo = {}; # info about drives included in backup
+    my $virtdev_hash = {}; # info about allocated drives
+
+    eval {
+	# enable interrupts
+	local $SIG{INT} =
+	    local $SIG{TERM} =
+	    local $SIG{QUIT} =
+	    local $SIG{HUP} =
+	    local $SIG{PIPE} = sub { die "interrupted by signal\n"; };
+
+	my $cfgfn = "$tmpdir/qemu-server.conf";
+	my $firewall_config_fn = "$tmpdir/fw.conf";
+
+	my $cmd = "restore";
+
+	my ($mechanism, $vmtype) =
+	    $backup_provider->restore_get_mechanism($volname, $storeid);
+	die "mechanism '$mechanism' requested by backup provider is not supported for VMs\n"
+	    if $mechanism ne 'qemu-img';
+	die "cannot restore non-VM guest of type '$vmtype'\n" if $vmtype ne 'qemu';
+
+	$devinfo = $backup_provider->restore_vm_init($volname, $storeid);
+
+	my $data = $backup_provider->restore_get_guest_config($volname, $storeid)
+	    or die "backup provider failed to extract guest configuration\n";
+	PVE::Tools::file_set_contents($cfgfn, $data);
+
+	if ($data = $backup_provider->restore_get_firewall_config($volname, $storeid)) {
+	    PVE::Tools::file_set_contents($firewall_config_fn, $data);
+	    my $pve_firewall_dir = '/etc/pve/firewall';
+	    mkdir $pve_firewall_dir; # make sure the dir exists
+	    PVE::Tools::file_copy($firewall_config_fn, "${pve_firewall_dir}/$vmid.fw");
+	}
+
+	my $fh = IO::File->new($cfgfn, "r") or die "unable to read qemu-server.conf - $!\n";
+
+	$virtdev_hash = $parse_backup_hints->($rpcenv, $user, $storecfg, $fh, $devinfo, $options);
+
+	# create empty/temp config
+	PVE::Tools::file_set_contents($conffile, "memory: 128\nlock: create");
+
+	$restore_cleanup_oldconf->($storecfg, $vmid, $oldconf, $virtdev_hash) if $oldconf;
+
+	# allocate volumes
+	my $map = $restore_allocate_devices->($storecfg, $virtdev_hash, $vmid);
+
+	for my $virtdev (sort keys $virtdev_hash->%*) {
+	    my $d = $virtdev_hash->{$virtdev};
+	    next if $d->{is_cloudinit}; # no need to restore cloudinit
+
+	    my $info =
+		$backup_provider->restore_vm_volume_init($volname, $storeid, $d->{devname}, {});
+	    my $source_path = $info->{'qemu-img-path'}
+		or die "did not get source image path from backup provider\n";
+	    eval {
+		qemu_img_convert(
+		    $source_path, $d->{volid}, $d->{size}, undef, 0, $options->{bwlimit});
+	    };
+	    my $err = $@;
+	    eval {
+		$backup_provider->restore_vm_volume_cleanup($volname, $storeid, $d->{devname}, {});
+	    };
+	    if (my $cleanup_err = $@) {
+		die $cleanup_err if !$err;
+		warn $cleanup_err;
+	    }
+	    die $err if $err
+	}
+
+	$fh->seek(0, 0) || die "seek failed - $!\n";
+
+	my $cookie = { netcount => 0 };
+	while (defined(my $line = <$fh>)) {
+	    $new_conf_raw .= restore_update_config_line(
+		$cookie,
+		$map,
+		$line,
+		$options->{unique},
+	    );
+	}
+
+	$fh->close();
+    };
+    my $err = $@;
+
+    eval { $backup_provider->restore_vm_cleanup($volname, $storeid); };
+    warn "backup provider cleanup after restore failed - $@" if $@;
+
+    if ($err) {
+	$restore_deactivate_volumes->($storecfg, $virtdev_hash);
+    }
+
+    rmtree($tmpdir);
+
+    if ($err) {
+	$restore_destroy_volumes->($storecfg, $virtdev_hash);
+	die $err;
+    }
+
+    my $new_conf = restore_merge_config($conffile, $new_conf_raw, $options->{override_conf});
+    check_restore_permissions($rpcenv, $user, $new_conf);
+    PVE::QemuConfig->write_config($vmid, $new_conf);
+
+    eval { rescan($vmid, 1); };
+    warn $@ if $@;
+
+    PVE::AccessControl::add_vm_to_pool($vmid, $options->{pool}) if $options->{pool};
+
+    return;
+}
+
 sub pbs_live_restore {
     my ($vmid, $conf, $storecfg, $restored_disks, $opts) = @_;
 
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


  parent reply	other threads:[~2025-03-21 13:57 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-21 13:48 [pve-devel] [PATCH-SERIES qemu/common/storage/qemu-server/container/manager v5 00/32] backup provider API Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu v5 01/32] PVE backup: add target ID in backup state Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu v5 02/32] PVE backup: get device info: allow caller to specify filter for which devices use fleecing Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu v5 03/32] PVE backup: implement backup access setup and teardown API for external providers Fiona Ebner
2025-03-24 13:02   ` Wolfgang Bumiller
2025-03-25 10:51     ` Fiona Ebner
2025-03-25 11:11     ` Fiona Ebner
2025-03-25 11:22       ` Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu v5 04/32] PVE backup: implement bitmap support for external backup access Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu v5 05/32] PVE backup: backup-access api: indicate situation where a bitmap was recreated Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH common v5 06/32] syscall: expose fallocate syscall Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH storage v5 07/32] add storage_has_feature() helper function Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH storage v5 08/32] common: add deallocate " Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH storage v5 09/32] plugin: introduce new_backup_provider() method Fiona Ebner
2025-03-24 15:43   ` Wolfgang Bumiller
2025-03-25 12:50     ` Fiona Ebner
2025-03-27 11:03       ` Wolfgang Bumiller
2025-03-27 13:58         ` Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH storage v5 10/32] config api/plugins: let plugins define sensitive properties themselves Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH storage v5 11/32] plugin api: bump api version and age Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH storage v5 12/32] extract backup config: delegate to backup provider for storages that support it Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [POC storage v5 13/32] add backup provider example Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [POC storage v5 14/32] Borg example plugin Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu-server v5 15/32] backup: keep track of block-node size for fleecing Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu-server v5 16/32] backup: fleecing: use exact size when allocating non-raw fleecing images Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu-server v5 17/32] backup: allow adding fleecing images also for EFI and TPM Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu-server v5 18/32] backup: implement backup for external providers Fiona Ebner
2025-03-21 13:48 ` Fiona Ebner [this message]
2025-03-21 13:48 ` [pve-devel] [PATCH qemu-server v5 20/32] backup restore: external: hardening check for untrusted source image Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu-server v5 21/32] backup: future-proof checks for QEMU feature support Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu-server v5 22/32] backup: support 'missing-recreated' bitmap action Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH qemu-server v5 23/32] backup: bitmap action to human: lie about TPM state Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH container v5 24/32] add LXC::Namespaces module Fiona Ebner
2025-03-24 12:38   ` Wolfgang Bumiller
2025-03-25 13:06     ` Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH container v5 25/32] backup: implement backup for external providers Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH container v5 26/32] backup: implement restore " Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH container v5 27/32] external restore: don't use 'one-file-system' tar flag when restoring from a directory Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH container v5 28/32] create: factor out compression option helper Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH container v5 29/32] restore tar archive: check potentially untrusted archive Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH container v5 30/32] api: add early check against restoring privileged container from external source Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH manager v5 31/32] ui: backup: also check for backup subtype to classify archive Fiona Ebner
2025-03-21 13:48 ` [pve-devel] [PATCH manager v5 32/32] backup: implement backup for external providers Fiona Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250321134852.103871-20-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal