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

snapshot_rollback: flock earlier

Browse Source 
to protect checks against concurrent modifications

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Tested-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-05-05 10:27:18 +02:00
parent 97b9ccec08
commit 82a0485717
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
PVE/AbstractConfig.pm
View File

@ -919,9 +919,10 @@ sub snapshot_rollback {
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
my $conf = $class->load_config($vmid); my $data = {};
my $get_snapshot_config = sub { my $get_snapshot_config = sub {
my ($conf) = @_;
die "you can't rollback if vm is a template\n" if $class->is_template($conf); die "you can't rollback if vm is a template\n" if $class->is_template($conf);
@ -932,32 +933,30 @@ sub snapshot_rollback {
return $res; return $res;
}; };
my $repl_conf = PVE::ReplicationConfig->new(); my $snap;
if ($repl_conf->check_for_existing_jobs($vmid, 1)) {
# remove all replication snapshots
my $volumes = $class->get_replicatable_volumes($storecfg, $vmid, $conf, 1);
my $sorted_volids = [ sort keys %$volumes ];
# remove all local replication snapshots (jobid => undef)
my $logfunc = sub { my $line = shift; chomp $line; print "$line\n"; };
PVE::Replication::prepare($storecfg, $sorted_volids, undef, 0, undef, $logfunc);
}
my $snap = &$get_snapshot_config();
$class->foreach_volume($snap, sub {
my ($vs, $volume) = @_;
$class->__snapshot_rollback_vol_possible($volume, $snapname);
});
my $data = {};
my $updatefn = sub { my $updatefn = sub {
my $conf = $class->load_config($vmid);
$snap = $get_snapshot_config->($conf);
$conf = $class->load_config($vmid); if ($prepare) {
my $repl_conf = PVE::ReplicationConfig->new();
if ($repl_conf->check_for_existing_jobs($vmid, 1)) {
# remove all replication snapshots
my $volumes = $class->get_replicatable_volumes($storecfg, $vmid, $conf, 1);
my $sorted_volids = [ sort keys %$volumes ];
$snap = &$get_snapshot_config(); # remove all local replication snapshots (jobid => undef)
my $logfunc = sub { my $line = shift; chomp $line; print "$line\n"; };
PVE::Replication::prepare($storecfg, $sorted_volids, undef, 0, undef, $logfunc);
}
$class->foreach_volume($snap, sub {
my ($vs, $volume) = @_;
$class->__snapshot_rollback_vol_possible($volume, $snapname);
});
}
die "unable to rollback to incomplete snapshot (snapstate = $snap->{snapstate})\n" die "unable to rollback to incomplete snapshot (snapstate = $snap->{snapstate})\n"
if $snap->{snapstate}; if $snap->{snapstate};