From 73f5867e6283f59af4e0a4c9a3668c6db499e89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 20 Mar 2025 00:40:10 -0400 Subject: [PATCH] incusd/network/common: Handle missing BGP peer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- internal/server/network/driver_common.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/server/network/driver_common.go b/internal/server/network/driver_common.go index 432d5b57a46..3eb775938ae 100644 --- a/internal/server/network/driver_common.go +++ b/internal/server/network/driver_common.go @@ -2,6 +2,7 @@ package network import ( "context" + "errors" "fmt" "net" "os" @@ -13,6 +14,7 @@ import ( incus "github.com/lxc/incus/v6/client" internalInstance "github.com/lxc/incus/v6/internal/instance" "github.com/lxc/incus/v6/internal/iprange" + "github.com/lxc/incus/v6/internal/server/bgp" "github.com/lxc/incus/v6/internal/server/cluster" "github.com/lxc/incus/v6/internal/server/cluster/request" "github.com/lxc/incus/v6/internal/server/db" @@ -699,7 +701,7 @@ func (n *common) bgpClearPeers(config map[string]string) error { // Remove the peer. fields := strings.Split(peer, ",") err := n.state.BGP.RemovePeer(net.ParseIP(fields[0])) - if err != nil { + if err != nil && !errors.Is(err, bgp.ErrPeerNotFound) { return err } }