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 807576CB6E for ; Fri, 24 Sep 2021 10:51:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75A2E2F47B for ; Fri, 24 Sep 2021 10:51:21 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6EC4F2F465 for ; Fri, 24 Sep 2021 10:51:20 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 5FFA510A23A; Fri, 24 Sep 2021 10:51:20 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 24 Sep 2021 10:51:19 +0200 Message-Id: <20210924085119.3079431-4-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210924085119.3079431-1-aderumier@odiso.com> References: <20210924085119.3079431-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.861 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm, qemumigrate.pm, qemumigratemock.pm] Subject: [pve-devel] [PATCH qemu-server 3/3] migration : add del_nets_bridge_fdb 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: Fri, 24 Sep 2021 08:51:51 -0000 at the end of a live migration, we need to remove old mac entries on source host (vm is not yet stopped), before resume vm on target host Signed-off-by: Alexandre Derumier --- PVE/QemuMigrate.pm | 1 + PVE/QemuServer.pm | 20 ++++++++++++++++++++ test/MigrationTest/QemuMigrateMock.pm | 3 +++ 3 files changed, 24 insertions(+) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 5ecc2a7..afd8021 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -1266,6 +1266,7 @@ sub phase3_cleanup { # transfer replication state before move config $self->transfer_replication_state() if $self->{is_replicated}; + PVE::QemuServer::del_nets_bridge_fdb($conf, $vmid); PVE::QemuConfig->move_config_to_node($vmid, $self->{node}); $self->switch_replication_job_target() if $self->{is_replicated}; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 2f51938..babaff8 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7817,4 +7817,24 @@ sub add_nets_bridge_fdb { } } } + +sub del_nets_bridge_fdb { + my ($conf, $vmid) = @_; + + foreach my $opt (keys %$conf) { + if ($opt =~ m/^net(\d+)$/) { + my $net = parse_net($conf->{$opt}); + next if !$net; + next if !$net->{macaddr}; + + my $iface = "tap${vmid}i$1"; + if ($have_sdn) { + PVE::Network::SDN::Zones::del_bridge_fdb($iface, $net->{macaddr}, $net->{bridge}, $net->{firewall}); + } else { + PVE::Network::del_bridge_fdb($iface, $net->{macaddr}, $net->{firewall}); + } + } + } +} + 1; diff --git a/test/MigrationTest/QemuMigrateMock.pm b/test/MigrationTest/QemuMigrateMock.pm index 8e0b7d0..a40f5c8 100644 --- a/test/MigrationTest/QemuMigrateMock.pm +++ b/test/MigrationTest/QemuMigrateMock.pm @@ -154,6 +154,9 @@ $MigrationTest::Shared::qemu_server_module->mock( $vm_stop_executed = 1; delete $expected_calls->{'vm_stop'}; }, + del_nets_bridge_fdb => sub { + return; + }, ); my $qemu_server_cpuconfig_module = Test::MockModule->new("PVE::QemuServer::CPUConfig"); -- 2.30.2