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 440B560223 for ; Tue, 1 Sep 2020 14:44:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F21C59468 for ; Tue, 1 Sep 2020 14:44:25 +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 B80C79298 for ; Tue, 1 Sep 2020 14:44:22 +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 810AF449AF for ; Tue, 1 Sep 2020 14:44:22 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Tue, 1 Sep 2020 14:44:19 +0200 Message-Id: <20200901124421.25901-4-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200901124421.25901-1-a.lauterer@proxmox.com> References: <20200901124421.25901-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.032 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [plugin.pm, lvmplugin.pm, zfspoolplugin.pm, rbdplugin.pm, storage.pm] Subject: [pve-devel] [PATCH v2 storage 3/5] 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: Tue, 01 Sep 2020 12:44:26 -0000 Functionality has been added for the following storage types: * dir based ones * directory * NFS * CIFS * ZFS * (thin) LVM * Ceph Signed-off-by: Aaron Lauterer --- rfc -> v1 -> v2: nothing changed PVE/Storage.pm | 10 ++++++++++ PVE/Storage/LVMPlugin.pm | 15 +++++++++++++++ PVE/Storage/Plugin.pm | 21 +++++++++++++++++++++ PVE/Storage/RBDPlugin.pm | 13 +++++++++++++ PVE/Storage/ZFSPoolPlugin.pm | 9 +++++++++ 5 files changed, 68 insertions(+) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 4a60615..919c606 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -1759,6 +1759,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/LVMPlugin.pm b/PVE/Storage/LVMPlugin.pm index c0740d4..28ff6c8 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) = @_; @@ -681,4 +688,12 @@ sub volume_import_write { input => '<&'.fileno($input_fh)); } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + + my $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid); + lvrename($scfg->{vgname}, $volname, $target_volname); + return "${storeid}:${target_volname}"; +} + 1; diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index 8a58ff4..770a482 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -1411,4 +1411,25 @@ sub volume_import_formats { return (); } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + + my $basedir = $class->get_subdir($scfg, 'images'); + my $imagedir = "${basedir}/${target_vmid}"; + + mkpath $imagedir; + + my @parsed_volname = $class->parse_volname($volname); + my $format = $parsed_volname[6]; + my $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid, $format, 1); + + my $old_path = "${basedir}/${volname}"; + my $new_path = "${imagedir}/${target_volname}"; + + rename($old_path, $new_path) || + die "rename '$old_path' to '$new_path' failed - $!\n"; + + return "${storeid}:${target_vmid}/${target_volname}"; +} + 1; diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 38f2b46..c0bd74c 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -719,4 +719,17 @@ sub volume_has_feature { return undef; } +sub reassign_volume { + my ($class, $scfg, $storeid, $volname, $target_vmid) = @_; + + my $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid); + my $cmd = $rbd_cmd->($scfg, $storeid, 'rename', $volname, $target_volname); + + run_rbd_command( + $cmd, + errmsg => "could not rename image '$volname' to '$target_volname'", + ); + return "${storeid}:${target_volname}"; +} + 1; diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index 10354b3..5baa5c2 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -749,4 +749,13 @@ 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 $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid); + $class->zfs_request($scfg, 5, 'rename', "$scfg->{pool}/$volname", "$scfg->{pool}/$target_volname"); + + return "${storeid}:${target_volname}"; +} + 1; -- 2.20.1