InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnetwork/drivers/macvlan, ipvlan: assorted minor cleanups

Browse Source 
- Inline some vars and align between drivers
- Remove nested if's where possible
- Use `WithError` for some logs, and use the context if available
- Scope variables locally where only used locally and, the reverse,
  make it clear where a (function-)global variable is used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-10-19 15:31:14 +02:00
parent a013147c40
commit 10faa629fe
3 changed files with 36 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/libnetwork/drivers/ipvlan/ipvlan_joinleave.go
View File

@@ -142,7 +142,7 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
if err != nil {
return err
}
if err = d.storeUpdate(ep); err != nil {
if err := d.storeUpdate(ep); err != nil {
return fmt.Errorf("failed to save ipvlan endpoint %.7s to store: %v", ep.id, err)
}

53
daemon/libnetwork/drivers/ipvlan/ipvlan_network.go
View File

@@ -64,7 +64,7 @@ func (d *driver) CreateNetwork(ctx context.Context, nid string, option map[strin
err = d.storeUpdate(config)
if err != nil {
d.deleteNetwork(config.ID)
log.G(context.TODO()).Debugf("encountered an error rolling back a network create for %s : %v", config.ID, err)
log.G(ctx).Debugf("encountered an error rolling back a network create for %s : %v", config.ID, err)
return err
}
@@ -110,14 +110,12 @@ func (d *driver) createNetwork(config *configuration) (bool, error) {
}
}
if !foundExisting {
n := &network{
d.addNetwork(&network{
id: config.ID,
driver: d,
endpoints: map[string]*endpoint{},
config: config,
}
// add the network
d.addNetwork(n)
})
}
return foundExisting, nil
@@ -138,23 +136,17 @@ func (d *driver) DeleteNetwork(nid string) error {
return fmt.Errorf("network id %s not found", nid)
}
// if the driver created the slave interface, delete it, otherwise leave it
if ok := n.config.CreatedSlaveLink; ok {
// if the interface exists, only delete if it matches iface.vlan or dummy.net_id naming
if ok := parentExists(n.config.Parent); ok {
// only delete the link if it is named the net_id
if n.config.Parent == getDummyName(nid) {
err := delDummyLink(n.config.Parent)
if err != nil {
log.G(context.TODO()).Debugf("link %s was not deleted, continuing the delete network operation: %v",
n.config.Parent, err)
}
} else {
// only delete the link if it matches iface.vlan naming
err := delVlanLink(n.config.Parent)
if err != nil {
log.G(context.TODO()).Debugf("link %s was not deleted, continuing the delete network operation: %v",
n.config.Parent, err)
}
// if the interface exists, only delete if it matches iface.vlan or dummy.net_id naming
if n.config.CreatedSlaveLink && parentExists(n.config.Parent) {
// only delete the link if it is named the net_id
if n.config.Parent == getDummyName(nid) {
if err := delDummyLink(n.config.Parent); err != nil {
log.G(context.TODO()).WithError(err).Debugf("link %s was not deleted, continuing the delete network operation", n.config.Parent)
}
} else {
// only delete the link if it matches iface.vlan naming
if err := delVlanLink(n.config.Parent); err != nil {
log.G(context.TODO()).WithError(err).Debugf("link %s was not deleted, continuing the delete network operation", n.config.Parent)
}
}
}
@@ -166,14 +158,13 @@ func (d *driver) DeleteNetwork(nid string) error {
}
if err := d.storeDelete(ep); err != nil {
log.G(context.TODO()).Warnf("Failed to remove ipvlan endpoint %.7s from store: %v", ep.id, err)
log.G(context.TODO()).WithError(err).Warnf("Failed to remove ipvlan endpoint %.7s from store", ep.id)
}
}
// delete the *network
d.deleteNetwork(nid)
// delete the network record from persistent cache
err := d.storeDelete(n.config)
if err != nil {
if err := d.storeDelete(n.config); err != nil {
return fmt.Errorf("error deleting id %s from datastore: %v", nid, err)
}
return nil
@@ -181,13 +172,13 @@ func (d *driver) DeleteNetwork(nid string) error {
// parseNetworkOptions parses docker network options
func parseNetworkOptions(id string, option options.Generic) (*configuration, error) {
var (
err error
config = &configuration{}
)
var config = &configuration{}
// parse generic labels first
if genData, ok := option[netlabel.GenericData]; ok && genData != nil {
if config, err = parseNetworkGenericOptions(genData); err != nil {
var err error
config, err = parseNetworkGenericOptions(genData)
if err != nil {
return nil, err
}
}
@@ -233,7 +224,7 @@ func parseNetworkOptions(id string, option options.Generic) (*configuration, err
return config, nil
}
// parseNetworkGenericOptions parse generic driver docker network options
// parseNetworkGenericOptions parses generic driver docker network options
func parseNetworkGenericOptions(data any) (*configuration, error) {
switch opt := data.(type) {
case *configuration:

31
daemon/libnetwork/drivers/macvlan/macvlan_network.go
View File

@@ -55,14 +55,14 @@ func (d *driver) CreateNetwork(ctx context.Context, nid string, option map[strin
err = d.storeUpdate(config)
if err != nil {
d.deleteNetwork(config.ID)
log.G(context.TODO()).Debugf("encountered an error rolling back a network create for %s : %v", config.ID, err)
log.G(ctx).Debugf("encountered an error rolling back a network create for %s : %v", config.ID, err)
return err
}
return nil
}
func (d *driver) GetSkipGwAlloc(opts options.Generic) (ipv4, ipv6 bool, _ error) {
func (d *driver) GetSkipGwAlloc(options.Generic) (ipv4, ipv6 bool, _ error) {
// Only set up a default gateway if the user configured one (the gateway
// must be external to the Docker macvlan network, the driver doesn't assign
// the address to anything).
@@ -166,17 +166,13 @@ func (d *driver) DeleteNetwork(nid string) error {
if n.config.CreatedSlaveLink && parentExists(n.config.Parent) && d.parentHasSingleUser(n.config.Parent) {
// only delete the link if it is named the net_id
if n.config.Parent == getDummyName(nid) {
err := delDummyLink(n.config.Parent)
if err != nil {
log.G(context.TODO()).Debugf("link %s was not deleted, continuing the delete network operation: %v",
n.config.Parent, err)
if err := delDummyLink(n.config.Parent); err != nil {
log.G(context.TODO()).WithError(err).Debugf("link %s was not deleted, continuing the delete network operation", n.config.Parent)
}
} else {
// only delete the link if it matches iface.vlan naming
err := delVlanLink(n.config.Parent)
if err != nil {
log.G(context.TODO()).Debugf("link %s was not deleted, continuing the delete network operation: %v",
n.config.Parent, err)
if err := delVlanLink(n.config.Parent); err != nil {
log.G(context.TODO()).WithError(err).Debugf("link %s was not deleted, continuing the delete network operation", n.config.Parent)
}
}
}
@@ -188,14 +184,13 @@ func (d *driver) DeleteNetwork(nid string) error {
}
if err := d.storeDelete(ep); err != nil {
log.G(context.TODO()).Warnf("Failed to remove macvlan endpoint %.7s from store: %v", ep.id, err)
log.G(context.TODO()).WithError(err).Warnf("Failed to remove macvlan endpoint %.7s from store", ep.id)
}
}
// delete the *network
d.deleteNetwork(nid)
// delete the network record from persistent cache
err := d.storeDelete(n.config)
if err != nil {
if err := d.storeDelete(n.config); err != nil {
return fmt.Errorf("error deleting id %s from datastore: %v", nid, err)
}
return nil
@@ -203,13 +198,13 @@ func (d *driver) DeleteNetwork(nid string) error {
// parseNetworkOptions parses docker network options
func parseNetworkOptions(id string, option options.Generic) (*configuration, error) {
var (
err error
config = &configuration{}
)
var config = &configuration{}
// parse generic labels first
if genData, ok := option[netlabel.GenericData]; ok && genData != nil {
if config, err = parseNetworkGenericOptions(genData); err != nil {
var err error
config, err = parseNetworkGenericOptions(genData)
if err != nil {
return nil, err
}
}