From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 6E10F1FF163 for ; Thu, 19 Dec 2024 11:43:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4516FEE8; Thu, 19 Dec 2024 11:43:28 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 19 Dec 2024 11:43:08 +0100 Message-Id: <20241219104316.35329-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241219104316.35329-1-f.ebner@proxmox.com> References: <20241219104316.35329-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage v3 05/13] rbd plugin: implement volume import/export 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" For now, only 'raw+size' is supported and it's not possible to export/import with snapshots. The volume or snapshot is exported or imported via the corresponding 'rbd' commands. Introducing an 'rbd' transport format might be feasible for more complete (i.e. with snapshots, incremental) transfer between two RBD storages. Use the '--dest-pool' switch rather than '-p' for import, because the latter is deprecated. Signed-off-by: Fiona Ebner --- Changes in v3: * use rbd export/import src/PVE/Storage/RBDPlugin.pm | 102 ++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm index 301918c..44770b0 100644 --- a/src/PVE/Storage/RBDPlugin.pm +++ b/src/PVE/Storage/RBDPlugin.pm @@ -88,7 +88,13 @@ my $build_cmd = sub { my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid); my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; - my $cmd = [$binary, '-p', $pool]; + + my $cmd = [$binary]; + if ($op eq 'import') { + push $cmd->@*, '--dest-pool', $pool; + } else { + push $cmd->@*, '-p', $pool; + } if (defined(my $namespace = $scfg->{namespace})) { # some subcommands will fail if the --namespace parameter is present @@ -864,6 +870,100 @@ sub volume_has_feature { return undef; } +sub volume_export_formats { + my ($class, $scfg, $storeid, $volname, $snapshot, $base_snapshot, $with_snapshots) = @_; + + return $class->volume_import_formats( + $scfg, $storeid, $volname, $snapshot, $base_snapshot, $with_snapshots); +} + +sub volume_export { + my ( + $class, + $scfg, + $storeid, + $fh, + $volname, + $format, + $snapshot, + $base_snapshot, + $with_snapshots, + ) = @_; + + die "volume export format $format not available for $class\n" if $format ne 'raw+size'; + die "cannot export volumes together with their snapshots in $class\n" if $with_snapshots; + die "cannot export an incremental stream in $class\n" if defined($base_snapshot); + + my ($size) = $class->volume_size_info($scfg, $storeid, $volname); + PVE::Storage::Plugin::write_common_header($fh, $size); + my $cmd = $rbd_cmd->($scfg, $storeid, 'export', '--export-format', '1', $volname, '-'); + run_rbd_command( + $cmd, + errmsg => 'could not export image', + output => '>&'.fileno($fh), + ); + + return; +} + +sub volume_import_formats { + my ($class, $scfg, $storeid, $volname, $snapshot, $base_snapshot, $with_snapshots) = @_; + return () if $with_snapshots; # not supported + return () if defined($base_snapshot); # not supported + return ('raw+size'); +} + +sub volume_import { + my ( + $class, + $scfg, + $storeid, + $fh, + $volname, + $format, + $snapshot, + $base_snapshot, + $with_snapshots, + $allow_rename, + ) = @_; + + die "volume import format $format not available for $class\n" if $format ne 'raw+size'; + die "cannot import volumes together with their snapshots in $class\n" if $with_snapshots; + die "cannot import an incremental stream in $class\n" if defined($base_snapshot); + + my (undef, $name, $vmid, undef, undef, undef, $file_format) = $class->parse_volname($volname); + die "cannot import format $format into a volume of format $file_format\n" + if $file_format ne 'raw'; + + if (rbd_volume_exists($scfg, $storeid, $name)) { + die "volume $name already exists\n" if !$allow_rename; + warn "volume $name already exists - importing with a different name\n"; + $volname = $class->find_free_diskname($storeid, $scfg, $vmid, $file_format); + } + + my ($size) = PVE::Storage::Plugin::read_common_header($fh); + $size = int($size/1024); + + eval { + my $cmd = $rbd_cmd->($scfg, $storeid, 'import', '--export-format', '1', '-', $volname); + run_rbd_command( + $cmd, + errmsg => 'could not import image', + input => '<&'.fileno($fh), + ); + }; + if (my $err = $@) { + # FIXME there is a slight race between finding the free disk name and removal here + # Does not only affect this plugin, see: + # https://lore.proxmox.com/pve-devel/20240403150712.262773-1-h.duerr@proxmox.com/ + eval { $class->free_image($storeid, $scfg, $volname, 0, $file_format); }; + warn $@ if $@; + die $err; + } + + return "$storeid:$volname"; +} + sub rename_volume { my ($class, $scfg, $storeid, $source_volname, $target_vmid, $target_volname) = @_; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel