From 2f0310d5bcb4769cd855c4c7e03da72c9d473d82 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sat, 31 Oct 2026 21:26:09 +0100 Subject: [PATCH] =?UTF-8?q?f-95:=20watchdog:=20MAC=20non=20fig=C3=A9e=20su?= =?UTF-8?q?r=20le=20tap=20signal=C3=A9e=20#95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: GnomeZworc --- internal/watchdog/check_vm.go | 19 +++++++++++++++++++ internal/watchdog/check_vm_test.go | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/internal/watchdog/check_vm.go b/internal/watchdog/check_vm.go index 96036bf..f467d92 100644 --- a/internal/watchdog/check_vm.go +++ b/internal/watchdog/check_vm.go @@ -3,12 +3,14 @@ package watchdog import ( "errors" "fmt" + "net" "path/filepath" "sort" "strconv" "strings" configuration "git.g3e.fr/syonad/two/internal/config/agent" + "git.g3e.fr/syonad/two/internal/netif" "git.g3e.fr/syonad/two/internal/netns" "git.g3e.fr/syonad/two/internal/nft" "git.g3e.fr/syonad/two/internal/qemu" @@ -125,6 +127,8 @@ func checkVMTap(entries map[string]string, prefix, name, vpc string, idx int, n if err := netns.Call(vpc, func() error { if p := linkProblem(tapName(tapID)); p != "" { n.Notify(kindVM, name, p+" (in netns "+vpc+")") + } else if p := tapMACProblem(entries[prefix+"mac"], tapID); p != "" { + n.Notify(kindVM, name, fmt.Sprintf("interface %d: %s (in netns %s)", idx, p, vpc)) } missing, err := nft.MissingRules(tapPortFromEntries(entries, prefix, tapID)) if err != nil { @@ -140,6 +144,21 @@ func checkVMTap(entries map[string]string, prefix, name, vpc string, idx int, n } } +func tapMACProblem(rawMAC string, tapID int) string { + mac, err := net.ParseMAC(rawMAC) + if err != nil { + return fmt.Sprintf("invalid mac %q in database: %v", rawMAC, err) + } + pinned, err := netif.TapHasMAC(tapID, mac) + switch { + case err != nil: + return fmt.Sprintf("fdb of %s unreadable: %v", tapName(tapID), err) + case !pinned: + return fmt.Sprintf("mac %s not pinned on %s (static sticky fdb entry missing)", mac, tapName(tapID)) + } + return "" +} + func checkVMQemu(cfg *configuration.Config, name string, n notify.Notifier) { sock := filepath.Join(cfg.QEMU.QMPDir, name+".sock") if _, err := qmp.Send(sock, nil); err != nil { diff --git a/internal/watchdog/check_vm_test.go b/internal/watchdog/check_vm_test.go index 46a7e20..d713966 100644 --- a/internal/watchdog/check_vm_test.go +++ b/internal/watchdog/check_vm_test.go @@ -267,3 +267,10 @@ func TestCheckVMs_ClesDeDisqueNeCreentPasDeFausseVM(t *testing.T) { } } } + +func TestTapMACProblem_InvalidMACInDatabase(t *testing.T) { + got := tapMACProblem("52:54:00:zz:01:32", 12345678) + if !strings.HasPrefix(got, `invalid mac "52:54:00:zz:01:32" in database`) { + t.Errorf("tapMACProblem = %q", got) + } +}