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

libnetwork: remove local store from overlay driver

Browse source 
Since the previous commit, data from the local store are never read,
thus proving it was only used for Classic Swarm.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
This commit is contained in:
Albin Kerouanton 2023-03-03 23:28:17 +01:00
parent 8aa1060c34
commit b67446a8fa
No known key found for this signature in database
GPG key ID: 630B8E1DCBDB1864
4 changed files with 0 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnetwork/drivers/overlay/joinleave.go
View file

@ -59,10 +59,6 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,
ep.ifName = containerIfName
if err = d.writeEndpointToStore(ep); err != nil {
return fmt.Errorf("failed to update overlay endpoint %.7s to local data store: %v", ep.id, err)
}
// Set the container interface and its peer MTU to 1450 to allow
// for 50 bytes vxlan encap (inner eth header(14) + outer IP(20) +
// outer UDP(8) + vxlan header(8))

24
libnetwork/drivers/overlay/ov_endpoint.go
View file

@ -92,10 +92,6 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
n.addEndpoint(ep)
if err := d.writeEndpointToStore(ep); err != nil {
return fmt.Errorf("failed to update overlay endpoint %.7s to local store: %v", ep.id, err)
}
return nil
}
@ -118,10 +114,6 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {
n.deleteEndpoint(eid)
if err := d.deleteEndpointFromStore(ep); err != nil {
logrus.Warnf("Failed to delete overlay endpoint %.7s from local store: %v", ep.id, err)
}
if ep.ifName == "" {
return nil
}
@ -142,22 +134,6 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
return make(map[string]interface{}), nil
}
func (d *driver) deleteEndpointFromStore(e *endpoint) error {
if d.localStore == nil {
return fmt.Errorf("overlay local store not initialized, ep not deleted")
}
return d.localStore.DeleteObjectAtomic(e)
}
func (d *driver) writeEndpointToStore(e *endpoint) error {
if d.localStore == nil {
return fmt.Errorf("overlay local store not initialized, ep not added")
}
return d.localStore.PutObjectAtomic(e)
}
func (ep *endpoint) DataScope() string {
return datastore.LocalScope
}

4
libnetwork/drivers/overlay/ov_network.go
View file

@ -224,10 +224,6 @@ func (d *driver) DeleteNetwork(nid string) error {
}
}
}
if err := d.deleteEndpointFromStore(ep); err != nil {
logrus.Warnf("Failed to delete overlay endpoint %.7s from local store: %v", ep.id, err)
}
}
doPeerFlush = true

15
libnetwork/drivers/overlay/overlay.go
View file

@ -12,8 +12,6 @@ import (
"github.com/docker/docker/libnetwork/datastore"
"github.com/docker/docker/libnetwork/discoverapi"
"github.com/docker/docker/libnetwork/driverapi"
"github.com/docker/docker/libnetwork/netlabel"
"github.com/docker/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
@ -32,7 +30,6 @@ type driver struct {
peerDb peerNetworkMap
secMap *encrMap
networks networkTable
localStore datastore.DataStore
initOS sync.Once
localJoinOnce sync.Once
keys []*key
@ -55,18 +52,6 @@ func Register(r driverapi.Registerer, config map[string]interface{}) error {
config: config,
}
if data, ok := config[netlabel.LocalKVClient]; ok {
var err error
dsc, ok := data.(discoverapi.DatastoreConfigData)
if !ok {
return types.InternalErrorf("incorrect data in datastore configuration: %v", data)
}
d.localStore, err = datastore.NewDataStoreFromConfig(dsc)
if err != nil {
return types.InternalErrorf("failed to initialize local data store: %v", err)
}
}
return r.RegisterDriver(networkType, d, c)
}