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 CD743630E0 for ; Fri, 2 Oct 2020 10:24:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BEC2C27E20 for ; Fri, 2 Oct 2020 10:24:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 5DAE427D0F for ; Fri, 2 Oct 2020 10:23:56 +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 2BC0445BA1 for ; Fri, 2 Oct 2020 10:23:56 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Fri, 2 Oct 2020 10:23:53 +0200 Message-Id: <20201002082354.20204-4-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201002082354.20204-1-a.lauterer@proxmox.com> References: <20201002082354.20204-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_SHORT 0.001 Use of a URL Shortener for very short URL RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [glusterfsplugin.pm, gnu.org, storage.pm, nfsplugin.pm, lvmthinplugin.pm, plugin.pm, basedirplugin.pm, cifsplugin.pm, rbdplugin.pm, zfspoolplugin.pm, plugins.pm, lvmplugin.pm, dirplugin.pm] Subject: [pve-devel] [PATCH v4 storage 3/4] add disk reassign feature 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: Fri, 02 Oct 2020 08:24:32 -0000 Functionality has been added for the following storage types: * dir based ones * directory * NFS * CIFS * gluster * ZFS * (thin) LVM * Ceph A new feature `reassign` has been introduced to mark which storage plugin supports the feature. Version API and AGE have been bumped. Signed-off-by: Aaron Lauterer --- v3 -> v4: * revert intermediate storage plugin for directory based plugins * add a `die "not supported"` method in Plugin.pm * dir based plugins now call the file_reassign_volume method in Plugin.pm as the generic file/directory based method * restored old `volume_has_feature` method in Plugin.pm and override it in directory based plugins to check against the new `reassign` feature (not too happy about the repetition for each plugin) v2 -> v3: * added feature flags instead of dummy "not implemented" methods in plugins which do not support it as that would break compatibility with 3rd party plugins. Had to make $features available outside the `has_features` method in Plugins.pm in order to be able to individually add features in the `BaseDirPlugin.pm`. * added the BaseDirPlugin.pm to maintain compat with 3rd party plugins, this is explained in the commit message * moved the actual renaming from the `reassign_volume` to a dedicated `rename_volume` method to make this functionality available to other possible uses in the future. * added support for linked clones ($base) rfc -> v1 -> v2: nothing changed PVE/Storage.pm | 15 ++++++++-- PVE/Storage/CIFSPlugin.pm | 19 +++++++++++++ PVE/Storage/DirPlugin.pm | 19 +++++++++++++ PVE/Storage/GlusterfsPlugin.pm | 19 +++++++++++++ PVE/Storage/LVMPlugin.pm | 24 ++++++++++++++++ PVE/Storage/LvmThinPlugin.pm | 1 + PVE/Storage/NFSPlugin.pm | 19 +++++++++++++ PVE/Storage/Plugin.pm | 51 ++++++++++++++++++++++++++++++++++ PVE/Storage/RBDPlugin.pm | 31 +++++++++++++++++++++ PVE/Storage/ZFSPoolPlugin.pm | 28 +++++++++++++++++++ 10 files changed, 224 insertions(+), 2 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 4a60615..874457b 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -40,11 +40,11 @@ use PVE::Storage::DRBDPlugin; use PVE::Storage::PBSPlugin; # Storage API version. Icrement it on changes in storage API interface. -use constant APIVER => 6; +use constant APIVER => 7; # Age is the number of versions we're backward compatible with. # This is like having 'current=APIVER' and age='APIAGE' in libtool, # see https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html -use constant APIAGE => 5; +use constant APIAGE => 6; # load standard plugins PVE::Storage::DirPlugin->register(); @@ -294,6 +294,7 @@ sub volume_snapshot_delete { # snapshot - taking a snapshot is possible # sparseinit - volume is sparsely initialized # template - conversion to base image is possible +# reassign - reassigning disks to other guest is possible # $snap - check if the feature is supported for a given snapshot # $running - if the guest owning the volume is running # $opts - hash with further options: @@ -1759,6 +1760,16 @@ sub complete_volume { return $res; } +sub reassign_volume { + my ($cfg, $volid, $target_vmid) = @_; + + my ($storeid, $volname) = parse_volume_id($volid); + my $scfg = storage_config($cfg, $storeid); + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); + + return $plugin->reassign_volume($scfg, $storeid, $volname, $target_vmid); +} + # Various io-heavy operations require io/bandwidth limits which can be # configured on multiple levels: The global defaults in datacenter.cfg, and # per-storage overrides. When we want to do a restore from storage A to storage diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm index 6edbc9d..13c81cc 100644 --- a/PVE/Storage/CIFSPlugin.pm +++ b/PVE/Storage/CIFSPlugin.pm @@ -280,4 +280,23 @@ sub check_connection { return 1; } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + return $class->file_reassign_volume($scfg, $storeid, $volname, $target_vmid); +} + +sub volume_has_feature { + my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running, $opts) = @_; + + my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = + $class->parse_volname($volname); + + if ($feature eq 'reassign') { + return 1 if !$isBase && $format =~ /^raw$|^qcow2$|^vmdk$/; + return undef; + } else { + return $class->SUPER::volume_has_feature($scfg, $feature, $storeid, $volname, $snapname, $running, $opts); + } +} + 1; diff --git a/PVE/Storage/DirPlugin.pm b/PVE/Storage/DirPlugin.pm index 3c81d24..fa61339 100644 --- a/PVE/Storage/DirPlugin.pm +++ b/PVE/Storage/DirPlugin.pm @@ -128,4 +128,23 @@ sub check_config { return $opts; } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + return $class->file_reassign_volume($scfg, $storeid, $volname, $target_vmid); +} + +sub volume_has_feature { + my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running, $opts) = @_; + + my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = + $class->parse_volname($volname); + + if ($feature eq 'reassign') { + return 1 if !$isBase && $format =~ /^raw$|^qcow2$|^vmdk$/; + return undef; + } else { + return $class->SUPER::volume_has_feature($scfg, $feature, $storeid, $volname, $snapname, $running, $opts); + } +} + 1; diff --git a/PVE/Storage/GlusterfsPlugin.pm b/PVE/Storage/GlusterfsPlugin.pm index 2dd414d..5c9fd78 100644 --- a/PVE/Storage/GlusterfsPlugin.pm +++ b/PVE/Storage/GlusterfsPlugin.pm @@ -348,4 +348,23 @@ sub check_connection { return defined($server) ? 1 : 0; } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + return $class->file_reassign_volume($scfg, $storeid, $volname, $target_vmid); +} + +sub volume_has_feature { + my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running, $opts) = @_; + + my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = + $class->parse_volname($volname); + + if ($feature eq 'reassign') { + return 1 if !$isBase && $format =~ /^raw$|^qcow2$|^vmdk$/; + return undef; + } else { + return $class->SUPER::volume_has_feature($scfg, $feature, $storeid, $volname, $snapname, $running, $opts); + } +} + 1; diff --git a/PVE/Storage/LVMPlugin.pm b/PVE/Storage/LVMPlugin.pm index c0740d4..4203eda 100644 --- a/PVE/Storage/LVMPlugin.pm +++ b/PVE/Storage/LVMPlugin.pm @@ -337,6 +337,13 @@ sub lvcreate { run_command($cmd, errmsg => "lvcreate '$vg/$name' error"); } +sub lvrename { + my ($vg, $oldname, $newname) = @_; + + my $cmd = ['/sbin/lvrename', $vg, $oldname, $newname]; + run_command($cmd, errmsg => "lvrename '${vg}/${oldname}' to '${newname}' error"); +} + sub alloc_image { my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_; @@ -581,6 +588,7 @@ sub volume_has_feature { my $features = { copy => { base => 1, current => 1}, + reassign => {current => 1}, }; my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) = @@ -681,4 +689,20 @@ sub volume_import_write { input => '<&'.fileno($input_fh)); } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + + $class->cluster_lock_storage($storeid, $scfg->{shared}, undef, sub { + my $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid); + return $class->rename_volume($scfg, $storeid, $volname, $target_volname, $target_vmid); + }); +} + +sub rename_volume { + my ($class, $scfg, $storeid, $source_volname, $target_volname, $vmid) = @_; + + lvrename($scfg->{vgname}, $source_volname, $target_volname); + return "${storeid}:${target_volname}"; +} + 1; diff --git a/PVE/Storage/LvmThinPlugin.pm b/PVE/Storage/LvmThinPlugin.pm index d1c5b1f..adc4ae2 100644 --- a/PVE/Storage/LvmThinPlugin.pm +++ b/PVE/Storage/LvmThinPlugin.pm @@ -355,6 +355,7 @@ sub volume_has_feature { template => { current => 1}, copy => { base => 1, current => 1, snap => 1}, sparseinit => { base => 1, current => 1}, + reassign => {current => 1}, }; my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) = diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm index 6abb24b..9d45e9f 100644 --- a/PVE/Storage/NFSPlugin.pm +++ b/PVE/Storage/NFSPlugin.pm @@ -176,4 +176,23 @@ sub check_connection { return 1; } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + return $class->file_reassign_volume($scfg, $storeid, $volname, $target_vmid); +} + +sub volume_has_feature { + my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running, $opts) = @_; + + my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = + $class->parse_volname($volname); + + if ($feature eq 'reassign') { + return 1 if !$isBase && $format =~ /^raw$|^qcow2$|^vmdk$/; + return undef; + } else { + return $class->SUPER::volume_has_feature($scfg, $feature, $storeid, $volname, $snapname, $running, $opts); + } +} + 1; diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index e6cd99c..d10f1aa 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -888,6 +888,7 @@ sub storage_can_replicate { return 0; } + sub volume_has_feature { my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running, $opts) = @_; @@ -1411,4 +1412,54 @@ sub volume_import_formats { return (); } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + die "no implemented in class '$class'\n"; +} + +# general reassignment method for file/directory based storages +sub file_reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + + my $base; + my $base_vmid; + my $format; + my $source_vmid; + + (undef, $volname, $source_vmid, $base, $base_vmid, undef, $format) = $class->parse_volname($volname); + + # parse_volname strips the directory from volname + my $source_volname = "${source_vmid}/${volname}"; + + if ($base) { + $base = "${base_vmid}/${base}/"; + } else { + $base = ''; + } + + $class->cluster_lock_storage($storeid, $scfg->{shared}, undef, sub { + my $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid, $format, 1); + + return $class->rename_volume($scfg, $storeid, $source_volname, $target_volname, $target_vmid, $base); + }); +} + +sub rename_volume { + my ($class, $scfg, $storeid, $source_volname, $target_volname, $vmid, $base) = @_; + + my $basedir = $class->get_subdir($scfg, 'images'); + my $imagedir = "${basedir}/${vmid}"; + + mkpath $imagedir; + + my $old_path = "${basedir}/${source_volname}"; + my $new_path = "${imagedir}/${target_volname}"; + + rename($old_path, $new_path) || + die "rename '$old_path' to '$new_path' failed - $!\n"; + + return "${storeid}:${base}${vmid}/${target_volname}"; +} + + 1; diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 38f2b46..325937a 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -703,6 +703,7 @@ sub volume_has_feature { template => { current => 1}, copy => { base => 1, current => 1, snap => 1}, sparseinit => { base => 1, current => 1}, + reassign => {current => 1}, }; my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) = @@ -719,4 +720,34 @@ sub volume_has_feature { return undef; } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + + my $base;; + (undef, $volname, undef, $base) = $class->parse_volname($volname); + + if ($base) { + $base = $base . '/'; + } else { + $base = ''; + } + + $class->cluster_lock_storage($storeid, $scfg->{shared}, undef, sub { + my $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid); + return $class->rename_volume($scfg, $storeid, $volname, $target_volname, $target_vmid, $base); + }); +} + +sub rename_volume { + my ($class, $scfg, $storeid, $source_volname, $target_volname, $vmid, $base) = @_; + + my $cmd = $rbd_cmd->($scfg, $storeid, 'rename', $source_volname, $target_volname); + + run_rbd_command( + $cmd, + errmsg => "could not rename image '${source_volname}' to '${target_volname}'", + ); + return "${storeid}:${base}${target_volname}"; +} + 1; diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index 6ac05b4..42f183c 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -11,6 +11,8 @@ use PVE::RPCEnvironment; use PVE::Storage::Plugin; use PVE::Tools qw(run_command); +use Data::Dumper; + use base qw(PVE::Storage::Plugin); sub type { @@ -658,6 +660,7 @@ sub volume_has_feature { copy => { base => 1, current => 1}, sparseinit => { base => 1, current => 1}, replicate => { base => 1, current => 1}, + reassign => {current => 1}, }; my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) = @@ -760,4 +763,29 @@ sub volume_import_formats { return $class->volume_export_formats($scfg, $storeid, $volname, undef, $base_snapshot, $with_snapshots); } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + + my $base;; + (undef, $volname, undef, $base) = $class->parse_volname($volname); + + if ($base) { + $base = $base . '/'; + } else { + $base = ''; + } + + $class->cluster_lock_storage($storeid, $scfg->{shared}, undef, sub { + my $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid); + return $class->rename_volume($scfg, $storeid, $volname, $target_volname, $target_vmid, $base); + }); +} + +sub rename_volume { + my ($class, $scfg, $storeid, $source_volname, $target_volname, $vmid, $base) = @_; + + $class->zfs_request($scfg, 5, 'rename', "$scfg->{pool}/$source_volname", "$scfg->{pool}/$target_volname"); + return "${storeid}:${base}${target_volname}"; +} + 1; -- 2.20.1