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 9454C70352 for ; Mon, 13 Jun 2022 12:30:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8A8159E34 for ; Mon, 13 Jun 2022 12:30:04 +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 id 42A589E04 for ; Mon, 13 Jun 2022 12:30:03 +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 1176F43ACA for ; Mon, 13 Jun 2022 12:30:03 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 13 Jun 2022 12:29:54 +0200 Message-Id: <20220613102959.36556-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613102959.36556-1-f.ebner@proxmox.com> References: <20220613102959.36556-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.050 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 v2 manager 1/2] pvesr: rename last_snapshots to local_snapshots 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, 13 Jun 2022 10:30:34 -0000 while dropping the instance where the local variable was unused. prepare() was changed a while ago to return all local snapshots. Signed-off-by: Fabian Ebner --- New in v2. PVE/CLI/pvesr.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/PVE/CLI/pvesr.pm b/PVE/CLI/pvesr.pm index cb79e2bf..a1be88af 100644 --- a/PVE/CLI/pvesr.pm +++ b/PVE/CLI/pvesr.pm @@ -136,16 +136,16 @@ __PACKAGE__->register_method ({ my $images = $plugin->list_images($storeid, $scfg, $vmid, undef, $cache); push @$volids, map { $_->{volid} } @$images; } - my ($last_snapshots, $cleaned_replicated_volumes) = PVE::Replication::prepare($storecfg, $volids, $jobid, $last_sync, $parent_snapname, $logfunc); + my ($local_snapshots, $cleaned_replicated_volumes) = PVE::Replication::prepare($storecfg, $volids, $jobid, $last_sync, $parent_snapname, $logfunc); foreach my $volid (keys %$cleaned_replicated_volumes) { if (!$wanted_volids->{$volid}) { $logfunc->("$jobid: delete stale volume '$volid'"); PVE::Storage::vdisk_free($storecfg, $volid); - delete $last_snapshots->{$volid}; + delete $local_snapshots->{$volid}; } } - print to_json($last_snapshots) . "\n"; + print to_json($local_snapshots) . "\n"; return undef; }}); @@ -200,8 +200,7 @@ __PACKAGE__->register_method ({ print STDERR "$msg\n"; }; - my $last_snapshots = PVE::Replication::prepare( - $storecfg, $volids, $jobid, $last_sync, undef, $logfunc); + PVE::Replication::prepare($storecfg, $volids, $jobid, $last_sync, undef, $logfunc); return undef; }}); -- 2.30.2