From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BD262674D6 for ; Thu, 30 Jul 2020 13:29:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B58BF16ACF for ; Thu, 30 Jul 2020 13:29:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0DFE316AC1 for ; Thu, 30 Jul 2020 13:29:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CE233433F1 for ; Thu, 30 Jul 2020 13:29:22 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 30 Jul 2020 13:29:14 +0200 Message-Id: <20200730112915.15402-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200730112915.15402-1-f.ebner@proxmox.com> References: <20200730112915.15402-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.057 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server 2/3] Repeat check for replication target in locked section X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2020 11:29:53 -0000 No need to warn twice, so the warning from the outside check was removed. Suggested-by: Fabian Grünbichler Signed-off-by: Fabian Ebner --- PVE/API2/Qemu.pm | 11 +++-------- PVE/QemuMigrate.pm | 13 +++++++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 8da616a..bc67666 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -3539,14 +3539,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}; diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index b699b67..a20e1c7 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -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. -- 2.20.1