kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix update endpoint cnt to store

Browse source 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
This commit is contained in:
Lei Jitang 2016-07-14 22:51:06 -04:00
parent 68e53443c9
commit 804f93bdff
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libnetwork/endpoint_cnt.go
View file

@ -113,6 +113,9 @@ func (ec *endpointCnt) updateStore() error {
if store == nil { if store == nil {
return fmt.Errorf("store not found for scope %s on endpoint count update", ec.DataScope()) return fmt.Errorf("store not found for scope %s on endpoint count update", ec.DataScope())
} }
// make a copy of count and n to avoid being overwritten by store.GetObject
count := ec.EndpointCnt()
n := ec.n
for { for {
if err := ec.n.getController().updateToStore(ec); err == nil || err != datastore.ErrKeyModified { if err := ec.n.getController().updateToStore(ec); err == nil || err != datastore.ErrKeyModified {
return err return err
@ -120,6 +123,10 @@ func (ec *endpointCnt) updateStore() error {
if err := store.GetObject(datastore.Key(ec.Key()...), ec); err != nil { if err := store.GetObject(datastore.Key(ec.Key()...), ec); err != nil {
return fmt.Errorf("could not update the kvobject to latest on endpoint count update: %v", err) return fmt.Errorf("could not update the kvobject to latest on endpoint count update: %v", err)
} }
ec.Lock()
ec.Count = count
ec.n = n
ec.Unlock()
} }
} }