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

Release address pool before removing the network from store

Browse source 
- On network delete it is better to release the gateway address
  and address pool before removing the network from the datastore,
  given ipam data is dependent on network data.

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2015-12-01 17:53:09 -08:00
parent 7a3601e7fd
commit dee3acc574
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libnetwork/network.go
View file

@ -603,12 +603,13 @@ func (n *network) Delete() error {
if err = n.getController().deleteFromStore(n.getEpCnt()); err != nil { if err = n.getController().deleteFromStore(n.getEpCnt()); err != nil {
return fmt.Errorf("error deleting network endpoint count from store: %v", err) return fmt.Errorf("error deleting network endpoint count from store: %v", err)
} }
n.ipamRelease()
if err = n.getController().deleteFromStore(n); err != nil { if err = n.getController().deleteFromStore(n); err != nil {
return fmt.Errorf("error deleting network from store: %v", err) return fmt.Errorf("error deleting network from store: %v", err)
} }
n.ipamRelease()
return nil return nil
} }