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 945F6A26FB for ; Mon, 19 Jun 2023 11:29:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7566E2721D for ; Mon, 19 Jun 2023 11:29:40 +0200 (CEST) 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 for ; Mon, 19 Jun 2023 11:29:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 28ECD468EA for ; Mon, 19 Jun 2023 11:29:39 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 19 Jun 2023 11:29:29 +0200 Message-Id: <20230619092937.604628-3-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230619092937.604628-1-a.lauterer@proxmox.com> References: <20230619092937.604628-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.087 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v5 qemu-server 2/10] qemuserver: foreach_volid: always include pending disks 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: Mon, 19 Jun 2023 09:29:40 -0000 All calling sites except for QemuConfig.pm::get_replicatable_volumes() already enabled it. Making it the non-configurable default results in a change in the VM replication. Now a disk image only referenced in the pending section will also be replicated. Signed-off-by: Aaron Lauterer --- changes since v4: - changed call in foreach_volid to a post-if as we only check for 2 conditions now. It should still be quite readable this way PVE/API2/Qemu.pm | 2 +- PVE/QemuConfig.pm | 2 +- PVE/QemuMigrate.pm | 2 +- PVE/QemuServer.pm | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 37f78fe..c92734a 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4164,7 +4164,7 @@ my $check_vm_disks_local = sub { my $local_disks = {}; # add some more information to the disks e.g. cdrom - PVE::QemuServer::foreach_volid($vmconf, 1, sub { + PVE::QemuServer::foreach_volid($vmconf, sub { my ($volid, $attr) = @_; my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1); diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm index 5e46db2..10e6929 100644 --- a/PVE/QemuConfig.pm +++ b/PVE/QemuConfig.pm @@ -161,7 +161,7 @@ sub get_replicatable_volumes { $volhash->{$volid} = 1; }; - PVE::QemuServer::foreach_volid($conf, undef, $test_volid); + PVE::QemuServer::foreach_volid($conf, $test_volid); return $volhash; } diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 3b3ef2a..b10a515 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -451,7 +451,7 @@ sub scan_local_volumes { if PVE::Storage::volume_is_base_and_used($storecfg, $volid); }; - PVE::QemuServer::foreach_volid($conf, 1, sub { + PVE::QemuServer::foreach_volid($conf, sub { my ($volid, $attr) = @_; eval { $test_volid->($volid, $attr); }; if (my $err = $@) { diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 8e6658e..7666dcb 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4855,7 +4855,7 @@ sub set_migration_caps { } sub foreach_volid { - my ($conf, $include_pending, $func, @param) = @_; + my ($conf, $func, @param) = @_; my $volhash = {}; @@ -4905,9 +4905,8 @@ sub foreach_volid { PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $test_volid); - if ($include_pending && defined($conf->{pending}) && $conf->{pending}->%*) { - PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $test_volid, undef, 1); - } + PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $test_volid, undef, 1) + if defined($conf->{pending}) && $conf->{pending}->%*; foreach my $snapname (keys %{$conf->{snapshots}}) { my $snap = $conf->{snapshots}->{$snapname}; @@ -6156,7 +6155,7 @@ sub get_vm_volumes { my ($conf) = @_; my $vollist = []; - foreach_volid($conf, 1, sub { + foreach_volid($conf, sub { my ($volid, $attr) = @_; return if $volid =~ m|^/|; -- 2.39.2