kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106737 from wojtek-t/cacher_events_processed_metrics 

Add watchcache metrics to tracking its progress

Kubernetes-commit: d7bcd8e7c0ce0e4476e1aa7041003ba7fe74fa10
This commit is contained in:
Kubernetes Publisher 2021-12-07 19:27:51 -08:00
parent 42a970a106 498feb7a9e
commit 62cdea67f1
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -46,7 +46,7 @@ require (
k8s.io/api v0.0.0-20211203085948-25b7aa9e86de k8s.io/api v0.0.0-20211203085948-25b7aa9e86de
k8s.io/apimachinery v0.0.0-20211208045959-67ffd82e6cff k8s.io/apimachinery v0.0.0-20211208045959-67ffd82e6cff
k8s.io/client-go v0.0.0-20211208050435-c713f38723cb k8s.io/client-go v0.0.0-20211208050435-c713f38723cb
k8s.io/component-base v0.0.0-20211203092501-60bec488f080 k8s.io/component-base v0.0.0-20211208050949-17742f0cef83
k8s.io/klog/v2 v2.30.0 k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
@ -60,5 +60,5 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20211203085948-25b7aa9e86de k8s.io/api => k8s.io/api v0.0.0-20211203085948-25b7aa9e86de
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211208045959-67ffd82e6cff k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211208045959-67ffd82e6cff
k8s.io/client-go => k8s.io/client-go v0.0.0-20211208050435-c713f38723cb k8s.io/client-go => k8s.io/client-go v0.0.0-20211208050435-c713f38723cb
k8s.io/component-base => k8s.io/component-base v0.0.0-20211203092501-60bec488f080 k8s.io/component-base => k8s.io/component-base v0.0.0-20211208050949-17742f0cef83
) )

4
go.sum
View File

@ -959,8 +959,8 @@ k8s.io/apimachinery v0.0.0-20211208045959-67ffd82e6cff h1:YOhVGWI7F5otLrzreq4Y6t
k8s.io/apimachinery v0.0.0-20211208045959-67ffd82e6cff/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= k8s.io/apimachinery v0.0.0-20211208045959-67ffd82e6cff/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
k8s.io/client-go v0.0.0-20211208050435-c713f38723cb h1:tbntDZ7c+LkEPnURV1oMy9HtSAU7vag2pDilT68PBLg= k8s.io/client-go v0.0.0-20211208050435-c713f38723cb h1:tbntDZ7c+LkEPnURV1oMy9HtSAU7vag2pDilT68PBLg=
k8s.io/client-go v0.0.0-20211208050435-c713f38723cb/go.mod h1:4l8IJYdxbF/Uo0zdB+OB48wOhs2/7FtuppsKYTXj1Fw= k8s.io/client-go v0.0.0-20211208050435-c713f38723cb/go.mod h1:4l8IJYdxbF/Uo0zdB+OB48wOhs2/7FtuppsKYTXj1Fw=
k8s.io/component-base v0.0.0-20211203092501-60bec488f080 h1:G2FyK080Yrlu0bZrru3nchG0ABRGFNaRIet230edgtw= k8s.io/component-base v0.0.0-20211208050949-17742f0cef83 h1:/YKdVgYQ4uRg+fks7/YhFFI/BuzCgYPQuNpbssNr31Y=
k8s.io/component-base v0.0.0-20211203092501-60bec488f080/go.mod h1:ps6SHYeOsJvoz1zvLfjkYts/xUlWlYsBjgki6W4Faxg= k8s.io/component-base v0.0.0-20211208050949-17742f0cef83/go.mod h1:Ezju43f/aFnlJPxnOeCGzPSqp/Xvhv/9nyyPLoeHhtk=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

2
pkg/storage/cacher/cacher.go
View File

@ -408,6 +408,7 @@ func (c *Cacher) startCaching(stopChannel <-chan struct{}) {
successfulList = true successfulList = true
c.ready.set(true) c.ready.set(true)
klog.V(1).Infof("cacher (%v): initialized", c.objectType.String()) klog.V(1).Infof("cacher (%v): initialized", c.objectType.String())
watchCacheInitializations.WithLabelValues(c.objectType.String()).Inc()
}) })
defer func() { defer func() {
if successfulList { if successfulList {
@ -822,6 +823,7 @@ func (c *Cacher) dispatchEvents() {
c.dispatchEvent(&event) c.dispatchEvent(&event)
} }
lastProcessedResourceVersion = event.ResourceVersion lastProcessedResourceVersion = event.ResourceVersion
eventsCounter.WithLabelValues(c.objectType.String()).Inc()
case <-bookmarkTimer.C(): case <-bookmarkTimer.C():
bookmarkTimer.Reset(wait.Jitter(time.Second, 0.25)) bookmarkTimer.Reset(wait.Jitter(time.Second, 0.25))
// Never send a bookmark event if we did not see an event here, this is fine // Never send a bookmark event if we did not see an event here, this is fine

31
pkg/storage/cacher/metrics.go
View File

@ -21,6 +21,11 @@ import (
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
) )
const (
namespace = "apiserver"
subsystem = "watch_cache"
)
/* /*
* By default, all the following metrics are defined as falling under * By default, all the following metrics are defined as falling under
* ALPHA stability level https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/1209-metrics-stability/kubernetes-control-plane-metrics-stability.md#stability-classes) * ALPHA stability level https://github.com/kubernetes/enhancements/blob/master/keps/sig-instrumentation/1209-metrics-stability/kubernetes-control-plane-metrics-stability.md#stability-classes)
@ -33,7 +38,18 @@ var (
initCounter = metrics.NewCounterVec( initCounter = metrics.NewCounterVec(
&metrics.CounterOpts{ &metrics.CounterOpts{
Name: "apiserver_init_events_total", Name: "apiserver_init_events_total",
Help: "Counter of init events processed in watchcache broken by resource type.", Help: "Counter of init events processed in watch cache broken by resource type.",
StabilityLevel: metrics.ALPHA,
},
[]string{"resource"},
)
eventsCounter = metrics.NewCounterVec(
&metrics.CounterOpts{
Namespace: namespace,
Subsystem: subsystem,
Name: "events_dispatched_total",
Help: "Counter of events dispatched in watch cache broken by resource type.",
StabilityLevel: metrics.ALPHA, StabilityLevel: metrics.ALPHA,
}, },
[]string{"resource"}, []string{"resource"},
@ -74,14 +90,27 @@ var (
}, },
[]string{"resource"}, []string{"resource"},
) )
watchCacheInitializations = metrics.NewCounterVec(
&metrics.CounterOpts{
Namespace: namespace,
Subsystem: subsystem,
Name: "watch_cache_initializations_total",
Help: "Counter of watch cache initializations broken by resource type.",
StabilityLevel: metrics.ALPHA,
},
[]string{"resource"},
)
) )
func init() { func init() {
legacyregistry.MustRegister(initCounter) legacyregistry.MustRegister(initCounter)
legacyregistry.MustRegister(eventsCounter)
legacyregistry.MustRegister(terminatedWatchersCounter) legacyregistry.MustRegister(terminatedWatchersCounter)
legacyregistry.MustRegister(watchCacheCapacityIncreaseTotal) legacyregistry.MustRegister(watchCacheCapacityIncreaseTotal)
legacyregistry.MustRegister(watchCacheCapacityDecreaseTotal) legacyregistry.MustRegister(watchCacheCapacityDecreaseTotal)
legacyregistry.MustRegister(watchCacheCapacity) legacyregistry.MustRegister(watchCacheCapacity)
legacyregistry.MustRegister(watchCacheInitializations)
} }
// recordsWatchCacheCapacityChange record watchCache capacity resize(increase or decrease) operations. // recordsWatchCacheCapacityChange record watchCache capacity resize(increase or decrease) operations.