proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-05 06:44:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Repeat check for replication target in locked section

Browse Source 
No need to warn twice, so the warning from the outside check
was removed.

Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-10-29 14:31:30 +01:00 committed by Fabian Grünbichler
parent 1749a376dc
commit 68980d6626
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/API2/Qemu.pm
View File

@ -3568,14 +3568,9 @@ __PACKAGE__->register_method({
my $repl_conf = PVE::ReplicationConfig->new();
my $is_replicated = $repl_conf->check_for_existing_jobs($vmid, 1);
my $is_replicated_to_target = defined($repl_conf->find_local_replication_job($vmid, $target));
if ($is_replicated && !$is_replicated_to_target) {
if ($param->{force}) {
warn "WARNING: Node '$target' is not a replication target. Existing replication " .
"jobs will fail after migration!\n";
} else {
die "Cannot live-migrate replicated VM to node '$target' - not a replication target." .
" Use 'force' to override.\n";
}
if (!$param->{force} && $is_replicated && !$is_replicated_to_target) {
die "Cannot live-migrate replicated VM to node '$target' - not a replication " .
"target. Use 'force' to override.\n";
}
} else {
warn "VM isn't running. Doing offline migration instead.\n" if $param->{online};

13
PVE/QemuMigrate.pm
View File

@ -227,6 +227,19 @@ sub prepare {
die "can't migrate running VM without --online\n" if !$online;
$running = $pid;
my $repl_conf = PVE::ReplicationConfig->new();
my $is_replicated = $repl_conf->check_for_existing_jobs($vmid, 1);
my $is_replicated_to_target = defined($repl_conf->find_local_replication_job($vmid, $self->{node}));
if ($is_replicated && !$is_replicated_to_target) {
if ($self->{opts}->{force}) {
$self->log('warn', "WARNING: Node '$self->{node}' is not a replication target. Existing " .
"replication jobs will fail after migration!\n");
} else {
die "Cannot live-migrate replicated VM to node '$self->{node}' - not a replication " .
"target. Use 'force' to override.\n";
}
}
$self->{forcemachine} = PVE::QemuServer::Machine::qemu_machine_pxe($vmid, $conf);
# To support custom CPU types, we keep QEMU's "-cpu" parameter intact.