Merge pull request #892 from cloudnativelabs/proxy-healtchecks

aauren · web-flow · commit f695c7522aeb · 2020-05-04T11:29:21.000-05:00
service proxy: ensure hearbeats are sent during sync
diff --git a/pkg/controllers/proxy/network_services_controller.go b/pkg/controllers/proxy/network_services_controller.go
@@ -375,6 +375,7 @@ func (nsc *NetworkServicesController) Run(healthChan chan<- *healthcheck.Control
 			}
 
 		case perform := <-nsc.syncChan:
+			healthcheck.SendHeartBeat(healthChan, "NSC")
 			switch perform {
 			case synctypeAll:
 				glog.V(1).Info("Performing requested full sync of services")
@@ -391,6 +392,9 @@ func (nsc *NetworkServicesController) Run(healthChan chan<- *healthcheck.Control
 					glog.Errorf("Error during ipvs sync in network service controller. Error: " + err.Error())
 				}
 			}
+			if err == nil {
+				healthcheck.SendHeartBeat(healthChan, "NSC")
+			}
 
 		case <-t.C:
 			glog.V(1).Info("Performing periodic sync of ipvs services")

Original file line number	Diff line number	Diff line change
`@@ -375,6 +375,7 @@ func (nsc NetworkServicesController) Run(healthChan chan<- healthcheck.Control`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`case perform := <-nsc.syncChan:`
	`378`	`+ healthcheck.SendHeartBeat(healthChan, "NSC")`
`378`	`379`	`switch perform {`
`379`	`380`	`case synctypeAll:`
`380`	`381`	`glog.V(1).Info("Performing requested full sync of services")`
`@@ -391,6 +392,9 @@ func (nsc NetworkServicesController) Run(healthChan chan<- healthcheck.Control`
`391`	`392`	`glog.Errorf("Error during ipvs sync in network service controller. Error: " + err.Error())`
`392`	`393`	`}`
`393`	`394`	`}`
	`395`	`+ if err == nil {`
	`396`	`+ healthcheck.SendHeartBeat(healthChan, "NSC")`
	`397`	`+ }`
`394`	`398`
`395`	`399`	`case <-t.C:`
`396`	`400`	`glog.V(1).Info("Performing periodic sync of ipvs services")`