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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D3D0060D9E for ; Thu, 3 Feb 2022 13:41:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C4E472663C for ; Thu, 3 Feb 2022 13:41:54 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 2D3C526631 for ; Thu, 3 Feb 2022 13:41:53 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0749A44BC1 for ; Thu, 3 Feb 2022 13:41:53 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 3 Feb 2022 13:41:22 +0100 Message-Id: <20220203124143.1931377-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220203124143.1931377-1-f.gruenbichler@proxmox.com> References: <20220203124143.1931377-1-f.gruenbichler@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.216 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [abstractmigrate.pm] Subject: [pve-devel] [PATCH v4 guest-common 1/3] migrate: handle migration_network with remote migration 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, 03 Feb 2022 12:41:54 -0000 remote migration always has an explicit endpoint from the start which gets used for everything. Signed-off-by: Fabian Grünbichler --- src/PVE/AbstractMigrate.pm | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/PVE/AbstractMigrate.pm b/src/PVE/AbstractMigrate.pm index af2be38..a20b213 100644 --- a/src/PVE/AbstractMigrate.pm +++ b/src/PVE/AbstractMigrate.pm @@ -115,22 +115,27 @@ sub migrate { $class = ref($class) || $class; - my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg'); + my ($ssh_info, $rem_ssh); + if (!$opts->{remote}) { + my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg'); - my $migration_network = $opts->{migration_network}; - if (!defined($migration_network)) { - $migration_network = $dc_conf->{migration}->{network}; - } - my $ssh_info = PVE::SSHInfo::get_ssh_info($node, $migration_network); - $nodeip = $ssh_info->{ip}; - - my $migration_type = 'secure'; - if (defined($opts->{migration_type})) { - $migration_type = $opts->{migration_type}; - } elsif (defined($dc_conf->{migration}->{type})) { - $migration_type = $dc_conf->{migration}->{type}; + my $migration_network = $opts->{migration_network}; + if (!defined($migration_network)) { + $migration_network = $dc_conf->{migration}->{network}; + } + $ssh_info = PVE::SSHInfo::get_ssh_info($node, $migration_network); + $nodeip = $ssh_info->{ip}; + + my $migration_type = 'secure'; + if (defined($opts->{migration_type})) { + $migration_type = $opts->{migration_type}; + } elsif (defined($dc_conf->{migration}->{type})) { + $migration_type = $dc_conf->{migration}->{type}; + } + $opts->{migration_type} = $migration_type; + $opts->{migration_network} = $migration_network; + $rem_ssh = PVE::SSHInfo::ssh_info_to_command($ssh_info); } - $opts->{migration_type} = $migration_type; my $self = { delayed_interrupt => 0, @@ -139,7 +144,7 @@ sub migrate { node => $node, ssh_info => $ssh_info, nodeip => $nodeip, - rem_ssh => PVE::SSHInfo::ssh_info_to_command($ssh_info) + rem_ssh => $rem_ssh, }; $self = bless $self, $class; @@ -162,7 +167,7 @@ sub migrate { &$eval_int($self, sub { $self->{running} = $self->prepare($self->{vmid}); }); die $@ if $@; - if (defined($migration_network)) { + if (defined($self->{opts}->{migration_network})) { $self->log('info', "use dedicated network address for sending " . "migration traffic ($self->{nodeip})"); -- 2.30.2