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 515CD1FF168 for ; Tue, 26 Nov 2024 16:24:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 61F0C5BDA; Tue, 26 Nov 2024 16:24:16 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Tue, 26 Nov 2024 16:23:25 +0100 Message-Id: <20241126152325.113926-8-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241126152325.113926-1-f.schauer@proxmox.com> References: <20241126152325.113926-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.027 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 v5 7/7] storage migrate: avoid ssh when moving a volume locally 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" Avoid the overhead of SSH when moving a volume between storages on the same node. Signed-off-by: Filip Schauer --- src/PVE/Storage.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index 5d25a2a..c1f383a 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -823,8 +823,6 @@ sub storage_migrate { my $target_volid = "${target_storeid}:${target_volname}"; - my $target_ip = $target_sshinfo->{ip}; - my $ssh = PVE::SSHInfo::ssh_info_to_command($target_sshinfo); my $ssh_base = PVE::SSHInfo::ssh_info_to_command_base($target_sshinfo); local $ENV{RSYNC_RSH} = PVE::Tools::cmd2string($ssh_base); @@ -844,7 +842,9 @@ sub storage_migrate { $import_fn = "tcp://$net"; } - my $recv = [ @$ssh, '--', $volume_import_prepare->($target_volid, $format, $import_fn, $opts)->@* ]; + my $recv = []; + push @$recv, (@$ssh, '--') if $target_sshinfo->{ip} ne "localhost"; + push @$recv, ($volume_import_prepare->($target_volid, $format, $import_fn, $opts)->@*); my $new_volid; my $pattern = volume_imported_message(undef, 1); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel