proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2026-01-08 04:53:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use a single replicate property (format pve-replicate)

Browse Source
This commit is contained in:
Dietmar Maurer 2017-05-06 10:35:08 +02:00
parent 76312b862b
commit 2286cb8c23
2 changed files with 4 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
PVE/API2/Qemu.pm
View File

@ -1029,16 +1029,6 @@ my $update_vm_api = sub {
if defined($conf->{pending}->{$opt});
PVE::QemuServer::vmconfig_delete_pending_option($conf, $opt, $force);
PVE::QemuConfig->write_config($vmid, $conf);
} elsif ($opt eq "replica" || $opt eq "replica_target") {
delete $conf->{$opt};
delete $conf->{replica} if $opt eq "replica_target";
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::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);
@ -1061,26 +1051,11 @@ my $update_vm_api = sub {
if defined($conf->{pending}->{$opt});
&$create_disks($rpcenv, $authuser, $conf->{pending}, $storecfg, $vmid, undef, {$opt => $param->{$opt}});
} elsif ($opt eq "replica") {
} elsif ($opt eq "replicate") {
die "Not all volumes are syncable, please check your config\n"
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};
PVE::ReplicationTools::update_conf($vmid, $opt, $param->{$opt});
} elsif ($opt eq "replica_target" ) {
die "Node: $param->{$opt} does not exists in Cluster.\n"
if !PVE::Cluster::check_node_exists($param->{$opt});
PVE::ReplicationTools::update_conf($vmid, $opt, $param->{$opt})
if defined($conf->{$opt});
my $repl = PVE::JSONSchema::check_format('pve-replicate', $param->{opt});
PVE::Cluster::check_node_exists($repl->{target});
$conf->{$opt} = $param->{$opt};
} else {
$conf->{pending}->{$opt} = $param->{$opt};
@ -1317,9 +1292,6 @@ __PACKAGE__->register_method({
syslog('info', "destroy VM $vmid: $upid\n");
# return without error if vm has no replica job
PVE::ReplicationTools::destroy_replica($vmid);
PVE::QemuServer::vm_destroy($storecfg, $vmid, $skiplock);
PVE::AccessControl::remove_vm_access($vmid);

26
PVE/QemuServer.pm
View File

@ -491,31 +491,7 @@ EODESCR
maxLength => 256,
optional => 1,
},
replica => {
optional => 1,
description => "Storage replica for local storage.",
type => 'boolean',
default => 0,
},
replica_rate_limit => {
optional => 1,
description => "Storage replica rate limit in KBytes/s.",
type => 'integer',
minimum => 1,
},
replica_interval => {
optional => 1,
description => "Storage replica sync interval",
type => 'integer',
minimum => 1,
maximum => 1440,
default => 15,
},
replica_target => {
optional => 1,
description => "Storage replica taget node.",
type => 'string',
},
replicate => get_standard_option('pve-replicate'),
protection => {
optional => 1,
type => 'boolean',