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 98EDC61666 for ; Wed, 9 Feb 2022 14:08:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 633611A3B for ; Wed, 9 Feb 2022 14:08:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 544051982 for ; Wed, 9 Feb 2022 14:08:05 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 28B984623A for ; Wed, 9 Feb 2022 14:08:05 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 9 Feb 2022 14:07:50 +0100 Message-Id: <20220209130750.902245-22-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209130750.902245-1-f.gruenbichler@proxmox.com> References: <20220209130750.902245-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.199 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v5 storage 3/3] add volume_import/export_start helpers 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: Wed, 09 Feb 2022 13:08:41 -0000 exposing the two halves of a storage migration for usage across cluster boundaries. Signed-off-by: Fabian Grünbichler --- Notes: v5: - re-use migration snapshot info from source in volume_import_start (fixes migration from non-btrfs to btrfs) - correctly pass snapshot (name), not migration_snapshot (bool) to volume_import_formats v4: - add log parameter - unify array-refs new in v3 PVE/Storage.pm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 5a5874a..b1d31bb 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -1833,6 +1833,67 @@ sub volume_imported_message { } } +# $format and $volname are requests and might be overruled depending on $opts +# $opts: +# - with_snapshots: passed to `pvesm import` and used to select import format +# - allow_rename: passed to `pvesm import` +# - export_formats: used to select common transport format +# - unix: unix socket path +sub volume_import_start { + my ($cfg, $storeid, $volname, $format, $vmid, $opts) = @_; + + my $with_snapshots = $opts->{'with_snapshots'} ? 1 : 0; + + $volname = $volname_for_storage->($cfg, $storeid, $volname, $vmid, $format); + + my $volid = "$storeid:$volname"; + + # find common import/export format, like volume_transfer_formats + my @import_formats = PVE::Storage::volume_import_formats($cfg, $volid, $opts->{snapshot}, undef, $with_snapshots); + my @export_formats = PVE::Tools::split_list($opts->{export_formats}); + my %import_hash = map { $_ => 1 } @import_formats; + my @common = grep { $import_hash{$_} } @export_formats; + die "no matching import/export format found for storage '$storeid'\n" + if !@common; + $format = $common[0]; + + my $input = IO::File->new(); + my $info = IO::File->new(); + + my $unix = $opts->{unix} // "/run/pve/storage-migrate-$vmid.$$.unix"; + my $import = $volume_import_prepare->($volid, $format, "unix://$unix", APIVER, $opts); + + unlink $unix; + my $cpid = open3($input, $info, $info, @$import) + or die "failed to spawn disk-import child - $!\n"; + + my $ready; + eval { + PVE::Tools::run_with_timeout(5, sub { $ready = <$info>; }); + }; + + die "failed to read readyness from disk import child: $@\n" if $@; + + print "$ready\n"; + + return { + fh => $info, + pid => $cpid, + socket => $unix, + format => $format, + }; +} + +sub volume_export_start { + my ($cfg, $volid, $format, $log, $opts) = @_; + + my $run_command_params = delete $opts->{cmd} // {}; + + my $cmds = $volume_export_prepare->($cfg, $volid, $format, $log, $opts); + + PVE::Tools::run_command($cmds, %$run_command_params); +} + # bash completion helper sub complete_storage { -- 2.30.2