Merge pull request #943 from mavenugo/netdel

Santhosh Manohar · Santhosh Manohar · commit 573bc304b71a · 2016-02-11T06:48:00.000-08:00
getNetworksFromStore should not fail on inconsistent network state
diff --git a/store.go b/store.go
@@ -139,7 +139,8 @@ func (c *controller) getNetworksFromStore() ([]*network, error) {
 			ec := &endpointCnt{n: n}
 			err = store.GetObject(datastore.Key(ec.Key()...), ec)
 			if err != nil {
-				return nil, fmt.Errorf("could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err)
+				log.Warnf("could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err)
+				continue
 			}
 
 			n.Lock()

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,8 @@ func (c controller) getNetworksFromStore() ([]network, error) {`
`139`	`139`	`ec := &endpointCnt{n: n}`
`140`	`140`	`err = store.GetObject(datastore.Key(ec.Key()...), ec)`
`141`	`141`	`if err != nil {`
`142`		`- return nil, fmt.Errorf("could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err)`
	`142`	`+ log.Warnf("could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err)`
	`143`	`+ continue`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`n.Lock()`