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 213F181DDE for ; Fri, 26 Nov 2021 11:52:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 17872170B1 for ; Fri, 26 Nov 2021 11:52:37 +0100 (CET) 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 6548F1709F for ; Fri, 26 Nov 2021 11:52:36 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3913944AAF for ; Fri, 26 Nov 2021 11:52:36 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 26 Nov 2021 11:52:31 +0100 Message-Id: <20211126105232.436044-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211126105232.436044-1-f.ebner@proxmox.com> References: <20211126105232.436044-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.175 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [replication.pm] Subject: [pve-devel] [PATCH guest-common 2/2] replication: prepare: simplify code 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: Fri, 26 Nov 2021 10:52:37 -0000 No functional change is intended. Signed-off-by: Fabian Ebner --- src/PVE/Replication.pm | 46 +++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm index de652f2..31cabec 100644 --- a/src/PVE/Replication.pm +++ b/src/PVE/Replication.pm @@ -176,32 +176,28 @@ sub prepare { foreach my $volid (@$volids) { my $info = PVE::Storage::volume_snapshot_info($storecfg, $volid); for my $snap (keys $info->%*) { - if ((defined($snapname) && ($snap eq $snapname)) || - (defined($parent_snapname) && ($snap eq $parent_snapname))) { - $last_snapshots->{$volid}->{$snap} = $info->{$snap}; - } elsif ($snap =~ m/^\Q$prefix\E/) { - if ($last_sync != 0) { - $logfunc->("delete stale replication snapshot '$snap' on $volid"); - eval { - PVE::Storage::volume_snapshot_delete($storecfg, $volid, $snap); - $cleaned_replicated_volumes->{$volid} = 1; - }; - - # If deleting the snapshot fails, we can not be sure if it was due to an error or a timeout. - # The likelihood that the delete has worked out is high at a timeout. - # If it really fails, it will try to remove on the next run. - if (my $err = $@) { - # warn is for syslog/journal. - warn $err; - - # logfunc will written in replication log. - $logfunc->("delete stale replication snapshot error: $err"); - } - # Last_sync=0 and a replication snapshot only occur, if the VM was stolen - } else { - $last_snapshots->{$volid}->{$snap} = $info->{$snap}; + if ( # check if it's a stale replication snapshot + !(defined($snapname) && $snap eq $snapname) && + !(defined($parent_snapname) && $snap eq $parent_snapname) && + $snap =~ m/^\Q$prefix\E/ && + $last_sync != 0 # last_sync is 0 if the VM was stolen + ) { + $logfunc->("delete stale replication snapshot '$snap' on $volid"); + eval { + PVE::Storage::volume_snapshot_delete($storecfg, $volid, $snap); + $cleaned_replicated_volumes->{$volid} = 1; + }; + + # If deleting the snapshot fails, we can not be sure if it was due to an error or a timeout. + # The likelihood that the delete has worked out is high at a timeout. + # If it really fails, it will try to remove on the next run. + if (my $err = $@) { + # warn is for syslog/journal. + warn $err; + + # logfunc will written in replication log. + $logfunc->("delete stale replication snapshot error: $err"); } - # Other snapshots might need to serve as replication base after rollback } else { $last_snapshots->{$volid}->{$snap} = $info->{$snap}; } -- 2.30.2