From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id EDB621FF16F for <inbox@lore.proxmox.com>; Thu, 13 Feb 2025 18:21:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6C30FBBB6; Thu, 13 Feb 2025 18:21:08 +0100 (CET) Message-ID: <630b7b1c-0e53-472c-9558-471fed079d9b@proxmox.com> Date: Thu, 13 Feb 2025 18:21:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>, Filip Schauer <f.schauer@proxmox.com> References: <20250120112842.36450-1-f.schauer@proxmox.com> <20250120112842.36450-8-f.schauer@proxmox.com> Content-Language: en-US From: Fiona Ebner <f.ebner@proxmox.com> In-Reply-To: <20250120112842.36450-8-f.schauer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.046 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: Re: [pve-devel] [PATCH storage v6 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 <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Am 20.01.25 um 12:28 schrieb Filip Schauer: > Avoid the overhead of SSH when moving a volume between storages on the > same node. > > Signed-off-by: Filip Schauer <f.schauer@proxmox.com> > --- > 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 761f612..a2bef55 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"; Instead of having a special value for the target IP, we could make the $target_sshinfo parameter optional. Because right now, you still do the lookup/command building with the PVE::SSHInfo calls above that are not required in this case. If you go for that, the patch is better ordered first. > + push @$recv, ($volume_import_prepare->($target_volid, $format, $import_fn, $opts)->@*); > > my $new_volid; > my $pattern = volume_imported_message(undef, 1); _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel