5
0
mirror of git://git.proxmox.com/git/pve-guest-common.git synced 2024-12-23 17:34:10 +03:00

config: activate affected storages for snapshot operations

For snapshot creation, the storage for the vmstate file is activated
via vdisk_alloc when the state file is created.

Do not activate the volumes themselves, as that has unnecessary side
effects (e.g. waiting for zvol device link for ZFS, mapping the volume
for RBD). If a storage can only do snapshot operations on a volume
that has been activated, it needs to activate the volume itself.

The actual implementation will be in the plugins to be able to skip
CD ROM drives and bind-mounts, etc.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2022-01-13 12:04:01 +01:00 committed by Thomas Lamprecht
parent 9643bddd3a
commit a68bfdb1ee

View File

@ -786,6 +786,13 @@ sub __snapshot_commit {
$class->lock_config($vmid, $updatefn); $class->lock_config($vmid, $updatefn);
} }
# Activates the storages affected by the snapshot operations.
sub __snapshot_activate_storages {
my ($class, $conf, $include_vmstate) = @_;
return; # FIXME PVE 8.x change to die 'implement me' and bump Breaks for older plugins
}
# Creates a snapshot for the VM/CT. # Creates a snapshot for the VM/CT.
sub snapshot_create { sub snapshot_create {
my ($class, $vmid, $snapname, $save_vmstate, $comment) = @_; my ($class, $vmid, $snapname, $save_vmstate, $comment) = @_;
@ -801,6 +808,8 @@ sub snapshot_create {
my $drivehash = {}; my $drivehash = {};
eval { eval {
$class->__snapshot_activate_storages($conf, 0);
if ($freezefs) { if ($freezefs) {
$class->__snapshot_freeze($vmid, 0); $class->__snapshot_freeze($vmid, 0);
} }
@ -884,6 +893,8 @@ sub snapshot_delete {
die "snapshot '$snapname' does not exist\n" if !defined($snap); die "snapshot '$snapname' does not exist\n" if !defined($snap);
$class->__snapshot_activate_storages($snap, 1) if !$drivehash;
$snapshot_delete_assert_not_needed_by_replication->($class, $vmid, $conf, $snap, $snapname) $snapshot_delete_assert_not_needed_by_replication->($class, $vmid, $conf, $snap, $snapname)
if !$drivehash && !$force; if !$drivehash && !$force;
@ -1085,6 +1096,8 @@ sub snapshot_rollback {
$snap = $get_snapshot_config->($conf); $snap = $get_snapshot_config->($conf);
if ($prepare) { if ($prepare) {
$class->__snapshot_activate_storages($snap, 1);
$rollback_remove_replication_snapshots->($class, $vmid, $snap, $snapname); $rollback_remove_replication_snapshots->($class, $vmid, $snap, $snapname);
$class->foreach_volume($snap, sub { $class->foreach_volume($snap, sub {