0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #47022 from akerouanton/libnet-bridge-dead-check-on-stale-default-nw

Browse source 
libnet/d/bridge: dead code: no conflict on stale default nw
This commit is contained in:
Sebastiaan van Stijn 2024-01-04 14:39:14 +01:00 • committed by GitHub
commit e9042385ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libnetwork/drivers/bridge/bridge_linux.go
View file

@ -42,14 +42,6 @@ const (
DefaultGatewayV6AuxKey = "DefaultGatewayIPv6"
)
type defaultBridgeNetworkConflict struct {
ID string
}
func (d defaultBridgeNetworkConflict) Error() string {
return fmt.Sprintf("Stale default bridge network %s", d.ID)
}
type (
iptableCleanFunc func() error
iptablesCleanFuncs []iptableCleanFunc
@ -674,15 +666,7 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d
// check network conflicts
if err = d.checkConflict(config); err != nil {
nerr, ok := err.(defaultBridgeNetworkConflict)
if !ok {
return err
}
// Got a conflict with a stale default network, clean that up and continue
log.G(context.TODO()).Warn(nerr)
if err := d.deleteNetwork(nerr.ID); err != nil {
log.G(context.TODO()).WithError(err).Debug("Error while cleaning up network on conflict")
}
return err
}
// there is no conflict, now create the network
@ -700,15 +684,6 @@ func (d *driver) checkConflict(config *networkConfiguration) error {
nwConfig := nw.config
nw.Unlock()
if err := nwConfig.Conflicts(config); err != nil {
if nwConfig.DefaultBridge {
// We encountered and identified a stale default network
// We must delete it as libnetwork is the source of truth
// The default network being created must be the only one
// This can happen only from docker 1.12 on ward
log.G(context.TODO()).Infof("Found stale default bridge network %s (%s)", nwConfig.ID, nwConfig.BridgeName)
return defaultBridgeNetworkConflict{nwConfig.ID}
}
return types.ForbiddenErrorf("cannot create network %s (%s): conflicts with network %s (%s): %s",
config.ID, config.BridgeName, nwConfig.ID, nwConfig.BridgeName, err.Error())
}

11
libnetwork/drivers/bridge/errors.go
View file

@ -104,17 +104,6 @@ func (uat ErrUnsupportedAddressType) Error() string {
// InvalidParameter denotes the type of this error
func (uat ErrUnsupportedAddressType) InvalidParameter() {}
// ActiveEndpointsError is returned when there are
// still active endpoints in the network being deleted.
type ActiveEndpointsError string
func (aee ActiveEndpointsError) Error() string {
return fmt.Sprintf("network %s has active endpoint", string(aee))
}
// Forbidden denotes the type of this error
func (aee ActiveEndpointsError) Forbidden() {}
// InvalidNetworkIDError is returned when the passed
// network id for an existing network is not a known id.
type InvalidNetworkIDError string