proxmox-mirrors/pve-guest-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-guest-common synced 2025-08-06 13:16:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replication: prepare: safeguard against removal if expected snapshot is missing

Browse Source 
Such a check would also have prevented the issue in 1aa4d84
("ReplicationState: purge state from non local vms") and other
scenarios where state and disk state are inconsistent with regard to
the last_sync snapshot.

AFAICT, all existing callers intending to remove all snapshots use
last_sync=1 so chaning the behavior for other (non-zero) values should
be fine.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2022-06-13 12:29:59 +02:00 committed by Fabian Grünbichler
parent 1e6416f172
commit c0b29481e4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/PVE/Replication.pm
View File

@ -153,9 +153,9 @@ sub remote_finalize_local_job {
PVE::Tools::run_command($cmd, outfunc => $logger, errfunc => $logger); PVE::Tools::run_command($cmd, outfunc => $logger, errfunc => $logger);
} }
# Finds all local snapshots and removes replication snapshots not matching $last_sync. Use # Finds all local snapshots and removes replication snapshots not matching $last_sync after checking
# last_sync=0 (or undef) to prevent removal (useful if VM was stolen). Use last_sync=1 to remove all # that it is present. Use last_sync=0 (or undef) to prevent removal (useful if VM was stolen). Use
# replication snapshots (limited to job if specified). # last_sync=1 to remove all replication snapshots (limited to job if specified).
sub prepare { sub prepare {
my ($storecfg, $volids, $jobid, $last_sync, $parent_snapname, $logfunc) = @_; my ($storecfg, $volids, $jobid, $last_sync, $parent_snapname, $logfunc) = @_;
@ -173,12 +173,19 @@ sub prepare {
my $cleaned_replicated_volumes = {}; my $cleaned_replicated_volumes = {};
foreach my $volid (@$volids) { foreach my $volid (@$volids) {
my $info = PVE::Storage::volume_snapshot_info($storecfg, $volid); my $info = PVE::Storage::volume_snapshot_info($storecfg, $volid);
my $removal_ok = !defined($snapname) || $info->{$snapname};
$removal_ok = 0 if $last_sync == 0; # last_sync=0 if the VM was stolen, don't remove!
$removal_ok = 1 if $last_sync == 1; # last_sync=1 is a special value used to remove all
$logfunc->("expected snapshot $snapname not present for $volid, not removing others")
if !$removal_ok && $last_sync > 1;
for my $snap (keys $info->%*) { for my $snap (keys $info->%*) {
if ( # check if it's a stale replication snapshot if ( # check if it's a stale replication snapshot
!(defined($snapname) && $snap eq $snapname) && !(defined($snapname) && $snap eq $snapname) &&
!(defined($parent_snapname) && $snap eq $parent_snapname) && !(defined($parent_snapname) && $snap eq $parent_snapname) &&
$snap =~ m/^\Q$prefix\E/ && $snap =~ m/^\Q$prefix\E/ &&
$last_sync != 0 # last_sync is 0 if the VM was stolen $removal_ok
) { ) {
$logfunc->("delete stale replication snapshot '$snap' on $volid"); $logfunc->("delete stale replication snapshot '$snap' on $volid");
eval { eval {