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

fix #3111: config: snapshot delete: check if replication still needs it

Browse Source 
and abort if it does and --force is not specified.

After rollback, the rollback snapshot might still be needed as the
base for incremental replication, because rollback removes (blocking)
replication snapshots.

It's not enough to limit the check to the most recent snapshot,
because new snapshots might've been created between rollback and
remove.

It's not enough to limit the check to snapshots without a parent (i.e.
in case of ZFS, the oldest), because some volumes might've been added
only after that, meaning the oldest snapshot is not an incremental
replication base for them.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-08-12 13:01:11 +02:00 committed by Fabian Grünbichler
parent 8d1cd44345
commit 602ca77cdb
3 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/PVE/AbstractConfig.pm
View File

@ -824,6 +824,44 @@ sub snapshot_create {
$class->__snapshot_commit($vmid, $snapname);
}
# Check if the snapshot might still be needed by a replication job.
my $snapshot_delete_assert_not_needed_by_replication = sub {
my ($class, $vmid, $conf, $snap, $snapname) = @_;
my $repl_conf = PVE::ReplicationConfig->new();
return if !$repl_conf->check_for_existing_jobs($vmid, 1);
my $storecfg = PVE::Storage::config();
# Current config's volumes are relevant for replication.
my $volumes = $class->get_replicatable_volumes($storecfg, $vmid, $conf, 1);
my $replication_jobs = $repl_conf->list_guests_local_replication_jobs($vmid);
$class->foreach_volume($snap, sub {
my ($vs, $volume) = @_;
my $volid_key = $class->volid_key();
my $volid = $volume->{$volid_key};
return if !$volumes->{$volid};
my $snapshots = PVE::Storage::volume_snapshot_list($storecfg, $volid);
for my $job ($replication_jobs->@*) {
my $jobid = $job->{id};
my @jobs_snapshots = grep {
PVE::Replication::is_replication_snapshot($_, $jobid)
} $snapshots->@*;
next if scalar(@jobs_snapshots) > 0;
die "snapshot '$snapname' needed by replication job '$jobid' - run replication first\n";
}
});
};
# Deletes a snapshot.
# Note: $drivehash is only set when called from snapshot_create.
sub snapshot_delete {
@ -838,6 +876,9 @@ sub snapshot_delete {
die "snapshot '$snapname' does not exist\n" if !defined($snap);
$snapshot_delete_assert_not_needed_by_replication->($class, $vmid, $conf, $snap, $snapname)
if !$drivehash && !$force;
$class->set_lock($vmid, 'snapshot-delete')
if (!$drivehash); # doesn't already have a 'snapshot' lock

6
src/PVE/Replication.pm
View File

@ -470,7 +470,11 @@ sub run_replication {
}
sub is_replication_snapshot {
my ($snapshot_name) = @_;
my ($snapshot_name, $jobid) = @_;
if (defined($jobid)) {
return $snapshot_name =~ m/^__replicate_\Q$jobid\E/ ? 1 : 0;
}
return $snapshot_name =~ m/^__replicate_/ ? 1 : 0;
}

14
src/PVE/ReplicationConfig.pm
View File

@ -228,6 +228,20 @@ sub find_local_replication_job {
return undef;
}
sub list_guests_local_replication_jobs {
my ($cfg, $vmid) = @_;
my $jobs = [];
for my $job (values %{$cfg->{ids}}) {
next if $job->{type} ne 'local' || $job->{guest} != $vmid;
push @{$jobs}, $job;
}
return $jobs;
}
# makes old_target the new source for all local jobs of this guest
# makes new_target the target for the single local job with target old_target
sub switch_replication_job_target_nolock {