Merge pull request kubernetes#90972 from squeed/proxy-last-queued-metric

k8s-ci-robot · web-flow · commit 592a79cfdef8 · 2020-05-12T21:01:01.000-07:00
proxy: followup to last-queued-change metric
diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go
@@ -504,8 +504,8 @@ func (proxier *Proxier) probability(n int) string {
 func (proxier *Proxier) Sync() {
 	if proxier.healthzServer != nil {
 		proxier.healthzServer.QueuedUpdate()
-		metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()
 	}
+	metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()
 	proxier.syncRunner.Run()
 }
 
@@ -515,6 +515,9 @@ func (proxier *Proxier) SyncLoop() {
 	if proxier.healthzServer != nil {
 		proxier.healthzServer.Updated()
 	}
+
+	// synthesize "last change queued" time as the informers are syncing.
+	metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()
 	proxier.syncRunner.Loop(wait.NeverStop)
 }
 
diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go
@@ -810,8 +810,8 @@ func CleanupLeftovers(ipvs utilipvs.Interface, ipt utiliptables.Interface, ipset
 func (proxier *Proxier) Sync() {
 	if proxier.healthzServer != nil {
 		proxier.healthzServer.QueuedUpdate()
-		metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()
 	}
+	metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()
 	proxier.syncRunner.Run()
 }
 
@@ -821,6 +821,8 @@ func (proxier *Proxier) SyncLoop() {
 	if proxier.healthzServer != nil {
 		proxier.healthzServer.Updated()
 	}
+	// synthesize "last change queued" time as the informers are syncing.
+	metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()
 	proxier.syncRunner.Loop(wait.NeverStop)
 }
 
diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go
@@ -34,7 +34,7 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"k8s.io/klog"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -736,8 +736,8 @@ func getHnsNetworkInfo(hnsNetworkName string) (*hnsNetworkInfo, error) {
 func (proxier *Proxier) Sync() {
 	if proxier.healthzServer != nil {
 		proxier.healthzServer.QueuedUpdate()
-		metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()
 	}
+	metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()
 	proxier.syncRunner.Run()
 }
 
@@ -747,6 +747,8 @@ func (proxier *Proxier) SyncLoop() {
 	if proxier.healthzServer != nil {
 		proxier.healthzServer.Updated()
 	}
+	// synthesize "last change queued" time as the informers are syncing.
+	metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()
 	proxier.syncRunner.Loop(wait.NeverStop)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -504,8 +504,8 @@ func (proxier *Proxier) probability(n int) string {`
`504`	`504`	`func (proxier *Proxier) Sync() {`
`505`	`505`	`if proxier.healthzServer != nil {`
`506`	`506`	`proxier.healthzServer.QueuedUpdate()`
`507`		`- metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()`
`508`	`507`	`}`
	`508`	`+ metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()`
`509`	`509`	`proxier.syncRunner.Run()`
`510`	`510`	`}`
`511`	`511`
`@@ -515,6 +515,9 @@ func (proxier *Proxier) SyncLoop() {`
`515`	`515`	`if proxier.healthzServer != nil {`
`516`	`516`	`proxier.healthzServer.Updated()`
`517`	`517`	`}`
	`518`	`+`
	`519`	`+ // synthesize "last change queued" time as the informers are syncing.`
	`520`	`+ metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()`
`518`	`521`	`proxier.syncRunner.Loop(wait.NeverStop)`
`519`	`522`	`}`
`520`	`523`
Original file line number	Diff line number	Diff line change
`@@ -810,8 +810,8 @@ func CleanupLeftovers(ipvs utilipvs.Interface, ipt utiliptables.Interface, ipset`
`810`	`810`	`func (proxier *Proxier) Sync() {`
`811`	`811`	`if proxier.healthzServer != nil {`
`812`	`812`	`proxier.healthzServer.QueuedUpdate()`
`813`		`- metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()`
`814`	`813`	`}`
	`814`	`+ metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()`
`815`	`815`	`proxier.syncRunner.Run()`
`816`	`816`	`}`
`817`	`817`
`@@ -821,6 +821,8 @@ func (proxier *Proxier) SyncLoop() {`
`821`	`821`	`if proxier.healthzServer != nil {`
`822`	`822`	`proxier.healthzServer.Updated()`
`823`	`823`	`}`
	`824`	`+ // synthesize "last change queued" time as the informers are syncing.`
	`825`	`+ metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()`
`824`	`826`	`proxier.syncRunner.Loop(wait.NeverStop)`
`825`	`827`	`}`
`826`	`828`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ import (`
`34`	`34`	`"github.com/davecgh/go-spew/spew"`
`35`	`35`	`"k8s.io/klog"`
`36`	`36`
`37`		`- "k8s.io/api/core/v1"`
	`37`	`+ v1 "k8s.io/api/core/v1"`
`38`	`38`	`"k8s.io/apimachinery/pkg/types"`
`39`	`39`	`"k8s.io/apimachinery/pkg/util/intstr"`
`40`	`40`	`"k8s.io/apimachinery/pkg/util/sets"`
`@@ -736,8 +736,8 @@ func getHnsNetworkInfo(hnsNetworkName string) (*hnsNetworkInfo, error) {`
`736`	`736`	`func (proxier *Proxier) Sync() {`
`737`	`737`	`if proxier.healthzServer != nil {`
`738`	`738`	`proxier.healthzServer.QueuedUpdate()`
`739`		`- metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()`
`740`	`739`	`}`
	`740`	`+ metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()`
`741`	`741`	`proxier.syncRunner.Run()`
`742`	`742`	`}`
`743`	`743`
`@@ -747,6 +747,8 @@ func (proxier *Proxier) SyncLoop() {`
`747`	`747`	`if proxier.healthzServer != nil {`
`748`	`748`	`proxier.healthzServer.Updated()`
`749`	`749`	`}`
	`750`	`+ // synthesize "last change queued" time as the informers are syncing.`
	`751`	`+ metrics.SyncProxyRulesLastQueuedTimestamp.SetToCurrentTime()`
`750`	`752`	`proxier.syncRunner.Loop(wait.NeverStop)`
`751`	`753`	`}`
`752`	`754`