dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-08 17:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47989 from robmry/ipv6_bridge_route_noerrlog

Browse Source 
Don't log an error about route-add for IPv6 bridge
This commit is contained in:
Albin Kerouanton
2024-06-14 18:50:20 +02:00
committed by GitHub
parent 34c3569768 17a59a7506
commit c467e4f08d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libnetwork/drivers/bridge/setup_ipv6_linux.go
View File

@@ -2,9 +2,11 @@ package bridge
import (
"context"
"errors"
"fmt"
"net/netip"
"os"
"syscall"
"github.com/containerd/log"
"github.com/vishvananda/netlink"
@@ -39,6 +41,8 @@ func setupBridgeIPv6(config *networkConfiguration, i *bridgeInterface) error {
}
// Setting route to global IPv6 subnet
// TODO(robmry) - remove this? The bridge is 'down' at this point so I think it
// always fails, and the route is added anyway when the bridge is set 'up'.
log.G(context.TODO()).Debugf("Adding route to IPv6 network %s via device %s", config.AddressIPv6.String(), config.BridgeName)
err = i.nlh.RouteAdd(&netlink.Route{
Scope: netlink.SCOPE_UNIVERSE,
@@ -46,7 +50,11 @@ func setupBridgeIPv6(config *networkConfiguration, i *bridgeInterface) error {
Dst: config.AddressIPv6,
})
if err != nil && !os.IsExist(err) {
log.G(context.TODO()).Errorf("Could not add route to IPv6 network %s via device %s: %s", config.AddressIPv6.String(), config.BridgeName, err)
if errors.Is(err, syscall.ENETDOWN) {
log.G(context.TODO()).Debugf("Could not add route to IPv6 network %s via device %s: %s", config.AddressIPv6.String(), config.BridgeName, err)
} else {
log.G(context.TODO()).Errorf("Could not add route to IPv6 network %s via device %s: %s", config.AddressIPv6.String(), config.BridgeName, err)
}
}
return nil