proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-28 18:45:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: replica: safer config update

Browse Source 
Configuration updates should only happen if and after their
change has successfully taken effect.
This commit is contained in:
Wolfgang Bumiller 2017-04-28 10:40:22 +02:00
parent 6e8044dcea
commit 6d449202ba
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/API2/Qemu.pm
View File

@ -1033,12 +1033,12 @@ my $update_vm_api = sub {
delete $conf->{$opt};
delete $conf->{replica} if $opt eq "replica_target";
PVE::QemuConfig->write_config($vmid, $conf);
PVE::ReplicationTools::job_remove($vmid);
PVE::QemuConfig->write_config($vmid, $conf);
} elsif ($opt eq "replica_interval" || $opt eq "replica_rate_limit") {
delete $conf->{$opt};
PVE::QemuConfig->write_config($vmid, $conf);
PVE::ReplicationTools::update_conf($vmid, $opt, $param->{$opt});
PVE::QemuConfig->write_config($vmid, $conf);
} else {
PVE::QemuServer::vmconfig_delete_pending_option($conf, $opt, $force);
PVE::QemuConfig->write_config($vmid, $conf);
@ -1066,6 +1066,12 @@ my $update_vm_api = sub {
if !PVE::ReplicationTools::check_guest_volumes_syncable($conf, 'qemu');
die "replica_target is required\n"
if !$conf->{replica_target} && !$param->{replica_target};
my $value = $param->{$opt};
if ($value) {
PVE::ReplicationTools::job_enable($vmid);
} else {
PVE::ReplicationTools::job_disable($vmid);
}
$conf->{$opt} = $param->{$opt};
} elsif ($opt eq "replica_interval" || $opt eq "replica_rate_limit") {
$conf->{$opt} = $param->{$opt};
@ -1083,14 +1089,6 @@ my $update_vm_api = sub {
PVE::QemuConfig->write_config($vmid, $conf);
}
if (defined($param->{replica})) {
if ($param->{replica}) {
PVE::ReplicationTools::job_enable($vmid);
} else {
PVE::ReplicationTools::job_disable($vmid);
}
}
# remove pending changes when nothing changed
$conf = PVE::QemuConfig->load_config($vmid); # update/reload
my $changes = PVE::QemuServer::vmconfig_cleanup_pending($conf);