mirrors/kube-router
1
0
Fork 0
mirror of https://github.com/cloudnativelabs/kube-router.git synced 2025-10-08 16:31:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

IPVS sync services performnce improvement (#253)

Browse Source 
During periodic sync of IPVS services there is a check if the required service
already existing in IPVS. For the check the list of currnet IPVS services are
read from IPVS. This is causing performance hit as number of services increases.

With this fix, Kube-router reads once from ipvs and use for further during service sync
This commit is contained in:
Murali Reddy 2017-12-19 17:24:18 +05:30 committed by GitHub
parent 38e30821a8
commit d13339c6fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/controllers/network_services_controller.go
View File

@ -238,6 +238,7 @@ type externalIPService struct {
// as learned from services and endpoints information from the api server // as learned from services and endpoints information from the api server
func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInfoMap, endpointsInfoMap endpointsInfoMap) error { func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInfoMap, endpointsInfoMap endpointsInfoMap) error {
var ipvsSvcs []*ipvs.Service
start := time.Now() start := time.Now()
defer func() { defer func() {
glog.Infof("sync ipvs servers took %v", time.Since(start)) glog.Infof("sync ipvs servers took %v", time.Since(start))
@ -266,6 +267,11 @@ func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInf
// map of active services and service endpoints // map of active services and service endpoints
activeServiceEndpointMap := make(map[string][]string) activeServiceEndpointMap := make(map[string][]string)
ipvsSvcs, err = h.GetServices()
if err != nil {
return errors.New("Failed get list of IPVS services due to: " + err.Error())
}
for k, svc := range serviceInfoMap { for k, svc := range serviceInfoMap {
var protocol uint16 var protocol uint16
if svc.protocol == "tcp" { if svc.protocol == "tcp" {
@ -283,7 +289,7 @@ func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInf
} }
// create IPVS service for the service to be exposed through the cluster ip // create IPVS service for the service to be exposed through the cluster ip
ipvsClusterVipSvc, err := ipvsAddService(svc.clusterIP, protocol, uint16(svc.port), svc.sessionAffinity, svc.scheduler) ipvsClusterVipSvc, err := ipvsAddService(ipvsSvcs, svc.clusterIP, protocol, uint16(svc.port), svc.sessionAffinity, svc.scheduler)
if err != nil { if err != nil {
glog.Errorf("Failed to create ipvs service for cluster ip: %s", err.Error()) glog.Errorf("Failed to create ipvs service for cluster ip: %s", err.Error())
continue continue
@ -315,7 +321,7 @@ func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInf
nodeServiceIds = make([]string, len(addrs)) nodeServiceIds = make([]string, len(addrs))
for i, addr := range addrs { for i, addr := range addrs {
ipvsNodeportSvcs[i], err = ipvsAddService(addr.IP, protocol, uint16(svc.nodePort), svc.sessionAffinity, svc.scheduler) ipvsNodeportSvcs[i], err = ipvsAddService(ipvsSvcs, addr.IP, protocol, uint16(svc.nodePort), svc.sessionAffinity, svc.scheduler)
if err != nil { if err != nil {
glog.Errorf("Failed to create ipvs service for node port due to: %s", err.Error()) glog.Errorf("Failed to create ipvs service for node port due to: %s", err.Error())
continue continue
@ -326,7 +332,7 @@ func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInf
} }
} else { } else {
ipvsNodeportSvcs = make([]*ipvs.Service, 1) ipvsNodeportSvcs = make([]*ipvs.Service, 1)
ipvsNodeportSvcs[0], err = ipvsAddService(nsc.nodeIP, protocol, uint16(svc.nodePort), svc.sessionAffinity, svc.scheduler) ipvsNodeportSvcs[0], err = ipvsAddService(ipvsSvcs, nsc.nodeIP, protocol, uint16(svc.nodePort), svc.sessionAffinity, svc.scheduler)
if err != nil { if err != nil {
glog.Errorf("Failed to create ipvs service for node port due to: %s", err.Error()) glog.Errorf("Failed to create ipvs service for node port due to: %s", err.Error())
continue continue
@ -388,7 +394,7 @@ func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInf
} }
// create IPVS service for the service to be exposed through the external ip // create IPVS service for the service to be exposed through the external ip
ipvsExternalIPSvc, err := ipvsAddService(net.ParseIP(externalIP), protocol, uint16(svc.port), svc.sessionAffinity, svc.scheduler) ipvsExternalIPSvc, err := ipvsAddService(ipvsSvcs, net.ParseIP(externalIP), protocol, uint16(svc.port), svc.sessionAffinity, svc.scheduler)
if err != nil { if err != nil {
glog.Errorf("Failed to create ipvs service for external ip: %s due to %s", externalIP, err.Error()) glog.Errorf("Failed to create ipvs service for external ip: %s due to %s", externalIP, err.Error())
continue continue
@ -484,7 +490,8 @@ func (nsc *NetworkServicesController) syncIpvsServices(serviceInfoMap serviceInf
// cleanup stale ipvs service and servers // cleanup stale ipvs service and servers
glog.Infof("Cleaning up if any, old ipvs service and servers which are no longer needed") glog.Infof("Cleaning up if any, old ipvs service and servers which are no longer needed")
ipvsSvcs, err := h.GetServices() ipvsSvcs, err = h.GetServices()
if err != nil { if err != nil {
return errors.New("Failed to list IPVS services: " + err.Error()) return errors.New("Failed to list IPVS services: " + err.Error())
} }
@ -1081,12 +1088,9 @@ func ipvsSetPersistence(svc *ipvs.Service, p bool) {
} }
} }
func ipvsAddService(vip net.IP, protocol, port uint16, persistent bool, scheduler string) (*ipvs.Service, error) { func ipvsAddService(svcs []*ipvs.Service, vip net.IP, protocol, port uint16, persistent bool, scheduler string) (*ipvs.Service, error) {
svcs, err := h.GetServices()
if err != nil {
return nil, err
}
var err error
for _, svc := range svcs { for _, svc := range svcs {
if vip.Equal(svc.Address) && protocol == svc.Protocol && port == svc.Port { if vip.Equal(svc.Address) && protocol == svc.Protocol && port == svc.Port {
if (persistent && (svc.Flags&0x0001) == 0) || (!persistent && (svc.Flags&0x0001) != 0) { if (persistent && (svc.Flags&0x0001) == 0) || (!persistent && (svc.Flags&0x0001) != 0) {