From 05b07a67f5c9b5edda1d918eb5191fc8d5b92802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 3 Feb 2022 13:41:41 +0100 Subject: [PATCH] storage_migrate: pull out snapshot decision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit into new top-level helper for re-use with remote migration. Signed-off-by: Fabian Grünbichler --- PVE/Storage.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 05be3dd..93ae3ac 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -643,6 +643,14 @@ my $volname_for_storage = sub { } }; +# whether a migration snapshot is needed for a given storage +sub storage_migrate_snapshot { + my ($cfg, $storeid) = @_; + my $scfg = storage_config($cfg, $storeid); + + return $scfg->{type} eq 'zfspool' || $scfg->{type} eq 'btrfs'; +} + sub storage_migrate { my ($cfg, $volid, $target_sshinfo, $target_storeid, $opts, $logfunc) = @_; @@ -688,10 +696,8 @@ sub storage_migrate { my $migration_snapshot; if (!defined($snapshot)) { - if ($scfg->{type} eq 'zfspool' || $scfg->{type} eq 'btrfs') { - $migration_snapshot = 1; - $snapshot = '__migration__'; - } + $migration_snapshot = storage_migrate_snapshot($cfg, $storeid); + $snapshot = '__migration__' if $migration_snapshot; } my @formats = volume_transfer_formats($cfg, $volid, $target_volid, $snapshot, $base_snapshot, $with_snapshots);