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

Ignoring locally scoped endpoints/networks from distributed delete

Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal 2015-06-19 13:34:16 -07:00
parent 5fda09dc68
commit 49d9787749

View file

@ -191,7 +191,10 @@ func (c *controller) watchNetworks() error {
lview := c.networks lview := c.networks
c.Unlock() c.Unlock()
for k, v := range lview { for k, v := range lview {
tmpview[k] = v global, _ := v.isGlobalScoped()
if global {
tmpview[k] = v
}
} }
c.processNetworkUpdate(nws, &tmpview) c.processNetworkUpdate(nws, &tmpview)
// Delete processing // Delete processing
@ -243,7 +246,10 @@ func (n *network) watchEndpoints() error {
lview := n.endpoints lview := n.endpoints
n.Unlock() n.Unlock()
for k, v := range lview { for k, v := range lview {
tmpview[k] = v global, _ := v.network.isGlobalScoped()
if global {
tmpview[k] = v
}
} }
for _, epe := range eps { for _, epe := range eps {
var ep endpoint var ep endpoint