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

store.getNetworksFromStore() remove unused error return

Browse source 
This function always returned `nil`, so we can remove the error
return, and update other functions that were handling errors.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-05-26 10:39:38 +02:00
parent b1729e8588
commit 07ed00102d
2 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libnetwork/controller.go
View file

@ -1020,12 +1020,7 @@ func (c *controller) addNetwork(n *network) error {
func (c *controller) Networks() []Network {
var list []Network
networks, err := c.getNetworksFromStore()
if err != nil {
logrus.Error(err)
}
for _, n := range networks {
for _, n := range c.getNetworksFromStore() {
if n.inDelete {
continue
}

27
libnetwork/store.go
View file

@ -80,11 +80,7 @@ func (c *controller) getStores() []datastore.DataStore {
}
func (c *controller) getNetworkFromStore(nid string) (*network, error) {
ns, err := c.getNetworksFromStore()
if err != nil {
return nil, err
}
for _, n := range ns {
for _, n := range c.getNetworksFromStore() {
if n.id == nid {
return n, nil
}
@ -128,12 +124,11 @@ func (c *controller) getNetworksForScope(scope string) ([]*network, error) {
return nl, nil
}
func (c *controller) getNetworksFromStore() ([]*network, error) {
func (c *controller) getNetworksFromStore() []*network {
var nl []*network
for _, store := range c.getStores() {
kvol, err := store.List(datastore.Key(datastore.NetworkKeyPrefix),
&network{ctrlr: c})
kvol, err := store.List(datastore.Key(datastore.NetworkKeyPrefix), &network{ctrlr: c})
// Continue searching in the next store if no keys found in this store
if err != nil {
if err != datastore.ErrKeyNotFound {
@ -143,10 +138,8 @@ func (c *controller) getNetworksFromStore() ([]*network, error) {
}
kvep, err := store.Map(datastore.Key(epCntKeyPrefix), &endpointCnt{})
if err != nil {
if err != datastore.ErrKeyNotFound {
logrus.Warnf("failed to get endpoint_count map for scope %s: %v", store.Scope(), err)
}
if err != nil && err != datastore.ErrKeyNotFound {
logrus.Warnf("failed to get endpoint_count map for scope %s: %v", store.Scope(), err)
}
for _, kvo := range kvol {
@ -168,7 +161,7 @@ func (c *controller) getNetworksFromStore() ([]*network, error) {
}
}
return nl, nil
return nl
}
func (n *network) getEndpointFromStore(eid string) (*endpoint, error) {
@ -455,13 +448,7 @@ func (c *controller) startWatch() {
}
func (c *controller) networkCleanup() {
networks, err := c.getNetworksFromStore()
if err != nil {
logrus.Warnf("Could not retrieve networks from store(s) during network cleanup: %v", err)
return
}
for _, n := range networks {
for _, n := range c.getNetworksFromStore() {
if n.inDelete {
logrus.Infof("Removing stale network %s (%s)", n.Name(), n.ID())
if err := n.delete(true, true); err != nil {