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

Merge pull request #1232 from mrjana/lb

Browse source 
Add all backend ip into service records if no vip
This commit is contained in:
Santhosh Manohar 2016-06-09 16:18:41 -07:00 • committed by GitHub
commit 756acc23b9
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libnetwork/service_linux.go
View file

@ -60,6 +60,13 @@ func (c *controller) addServiceBinding(name, sid, nid, eid string, vip net.IP, i
// applications have access to DNS RR. // applications have access to DNS RR.
n.(*network).addSvcRecords("tasks."+name, ip, nil, false) n.(*network).addSvcRecords("tasks."+name, ip, nil, false)
// Add service name to vip in DNS, if vip is valid. Otherwise resort to DNS RR
svcIP := vip
if len(svcIP) == 0 {
svcIP = ip
}
n.(*network).addSvcRecords(name, svcIP, nil, false)
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
@ -85,13 +92,6 @@ func (c *controller) addServiceBinding(name, sid, nid, eid string, vip net.IP, i
// we add a new service service in IPVS rules. // we add a new service service in IPVS rules.
addService = true addService = true
// Add service name to vip in DNS, if vip is valid. Otherwise resort to DNS RR
svcIP := vip
if len(svcIP) == 0 {
svcIP = ip
}
n.(*network).addSvcRecords(name, svcIP, nil, false)
} }
lb.backEnds[eid] = ip lb.backEnds[eid] = ip
@ -124,6 +124,14 @@ func (c *controller) rmServiceBinding(name, sid, nid, eid string, vip net.IP, in
// Delete the special "tasks.svc_name" backend record. // Delete the special "tasks.svc_name" backend record.
n.(*network).deleteSvcRecords("tasks."+name, ip, nil, false) n.(*network).deleteSvcRecords("tasks."+name, ip, nil, false)
// Make sure to remove the right IP since if vip is
// not valid we would have added a DNS RR record.
svcIP := vip
if len(svcIP) == 0 {
svcIP = ip
}
n.(*network).deleteSvcRecords(name, svcIP, nil, false)
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
@ -139,14 +147,6 @@ func (c *controller) rmServiceBinding(name, sid, nid, eid string, vip net.IP, in
// remove the service entry in IPVS. // remove the service entry in IPVS.
rmService = true rmService = true
// Make sure to remove the right IP since if vip is
// not valid we would have added a DNS RR record.
svcIP := vip
if len(svcIP) == 0 {
svcIP = ip
}
n.(*network).deleteSvcRecords(name, svcIP, nil, false)
delete(s.loadBalancers, nid) delete(s.loadBalancers, nid)
} }