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

Fixed getNetworkFromStore, which returned incorrect network information - notably, the 'resolver' field was empty.

Browse source 
This fixes https://github.com/moby/moby/issues/38901

Signed-off-by: Espen Suenson <mail@espensuenson.dk>
This commit is contained in:
Espen Suenson 2019-09-11 21:09:13 +02:00
parent b8f02469bc
commit 43a3151db2
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libnetwork/store.go
View file

@ -80,30 +80,12 @@ func (c *controller) getStores() []datastore.DataStore {
}
func (c *controller) getNetworkFromStore(nid string) (*network, error) {
for _, store := range c.getStores() {
n := &network{id: nid, ctrlr: c}
err := store.GetObject(datastore.Key(n.Key()...), n)
// Continue searching in the next store if the key is not found in this store
if err != nil {
if err != datastore.ErrKeyNotFound {
logrus.Debugf("could not find network %s: %v", nid, err)
}
continue
ns, err := c.getNetworksFromStore()
for _, n := range ns {
if n.id == nid {
return n, err
}
ec := &endpointCnt{n: n}
err = store.GetObject(datastore.Key(ec.Key()...), ec)
if err != nil && !n.inDelete {
return nil, fmt.Errorf("could not find endpoint count for network %s: %v", n.Name(), err)
}
n.epCnt = ec
if n.scope == "" {
n.scope = store.Scope()
}
return n, nil
}
return nil, fmt.Errorf("network %s not found", nid)
}