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 269C21FF16B
for <inbox@lore.proxmox.com>; Thu, 20 Feb 2025 10:20:42 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id D2D8DC6C6;
Thu, 20 Feb 2025 10:20:35 +0100 (CET)
Message-ID: <374ce95f-858e-4942-97fe-4189997e1742@proxmox.com>
Date: Thu, 20 Feb 2025 10:20:02 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Daniel Kral <d.kral@proxmox.com>
References: <20250211160825.254167-1-d.kral@proxmox.com>
<20250211160825.254167-22-d.kral@proxmox.com>
Content-Language: en-US
From: Fiona Ebner <f.ebner@proxmox.com>
In-Reply-To: <20250211160825.254167-22-d.kral@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.045 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
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
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 container v2 01/11] migration: prepare:
factor out common read-only variables
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 11.02.25 um 17:08 schrieb Daniel Kral:
> Factor out the common read-only variables to allow the second call to
> `storage_check_enabled` to be below 100 characters.
>
Just wanted to say in general, there is nothing wrong with using
$self->{node} either, especially if it's only used a single time,
because having an additional variable is more overhead then.
Still, can be fine in this case. But there are other usages of
$self->{node} further below in the branch for remote migration. And the
readability there would benefit more noticeably, because the variable is
used inside a string. So I'd rather go all the way, have the $node
variable be defined at the top level and used throughout the function.
> Signed-off-by: Daniel Kral <d.kral@proxmox.com>
> ---
> changes since v1:
> - new!
>
> src/PVE/LXC/Migrate.pm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
> index e1e6cab..f06a10a 100644
> --- a/src/PVE/LXC/Migrate.pm
> +++ b/src/PVE/LXC/Migrate.pm
> @@ -71,7 +71,8 @@ sub prepare {
> die "can't determine assigned storage for mount point '$ms'\n" if !$storage;
>
> # check if storage is available on both nodes
> - my $scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $storage);
> + my ($storecfg, $node) = $self->@{qw(storecfg node)};
> + my $scfg = PVE::Storage::storage_check_enabled($storecfg, $storage);
>
> my $targetsid = $storage;
>
> @@ -92,7 +93,7 @@ sub prepare {
> }
>
> if (!$remote) {
> - my $target_scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $targetsid, $self->{node});
> + my $target_scfg = PVE::Storage::storage_check_enabled($storecfg, $targetsid, $node);
>
> die "$volid: content type 'rootdir' is not available on storage '$targetsid'\n"
> if !$target_scfg->{content}->{rootdir};
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel