Bug 1825324: Use named queues for all controllers #95

adambkaplan · 2020-04-24T17:52:35Z

Add named queues for all ocm controllers
This exposes the workqueue_* metrics to kube-state-metrics

* Add named queues for all ocm controllers * This exposes the workqueue_* metrics to kube-state-metrics

openshift-ci-robot · 2020-04-24T17:52:40Z

@adambkaplan: This pull request references Bugzilla bug 1825324, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.0) matches configured target release for branch (4.5.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

WIP - Bug 1825324: Use named queues for all controllers

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

adambkaplan · 2020-04-27T13:36:08Z

New work queue metrics now appear in Prometheus!

adambkaplan

/hold cancel

Adding relevant team leads as an FYI - after this PR lands all controllers in OCM will have work queue metrics in Prometheus 😄

fyi @openshift/openshift-team-monitoring

adambkaplan · 2020-04-27T13:36:36Z

pkg/apps/deployer/factory.go

@@ -39,7 +39,7 @@ func NewDeployerController(
 		rn: kubeClientset.CoreV1(),
 		pn: kubeClientset.CoreV1(),

-		queue: workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
+		queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "deployer"),


/cc @tnozicka

adambkaplan · 2020-04-27T13:36:46Z

pkg/apps/deploymentconfig/factory.go

@@ -41,7 +41,7 @@ func NewDeploymentConfigController(
 		appsClient: appsClientset.AppsV1(),
 		kubeClient: kubeClientset.CoreV1(),

-		queue: workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
+		queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "deploymentconfig"),


/cc @tnozicka

adambkaplan · 2020-04-27T13:37:11Z

pkg/image/controller/signature/signature_import_controller.go

@@ -41,7 +41,7 @@ type SignatureImportController struct {

 func NewSignatureImportController(ctx context.Context, imageClient imagev1client.Interface, imageInformer imagev1informer.ImageInformer, resyncInterval, fetchTimeout time.Duration, limit int) *SignatureImportController {
 	controller := &SignatureImportController{
-		queue:                workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
+		queue:                workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "image-signature-import"),


adambkaplan · 2020-04-27T13:37:37Z

pkg/project/controller/project_finalizer_controller.go

@@ -38,7 +38,7 @@ func NewProjectFinalizerController(namespaces corev1informers.NamespaceInformer,
 	c := &ProjectFinalizerController{
 		client:      client,
 		cacheSynced: namespaces.Informer().HasSynced,
-		queue:       workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
+		queue:       workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "project-finalizer"),


/cc @deads2k

adambkaplan · 2020-04-27T13:37:48Z

pkg/route/ingressip/service_ingressip_controller.go

@@ -88,7 +88,7 @@ func NewIngressIPController(services cache.SharedIndexInformer, kc kclientset.In

 	ic := &IngressIPController{
 		client:     kc.CoreV1(),
-		queue:      workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
+		queue:      workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "ingressip"),


/cc @ironcladlou

adambkaplan · 2020-04-27T13:38:03Z

pkg/unidling/controller/unidling_controller.go

@@ -88,7 +88,7 @@ func NewUnidlingController(scaleNS scale.ScalesGetter, mapper meta.RESTMapper, e
 		scaleNamespacer:     scaleNS,
 		mapper:              mapper,
 		endpointsNamespacer: endptsNS,
-		queue:               workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()),
+		queue:               workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "unidling"),


/cc @deads2k

brancz · 2020-04-27T13:48:54Z

lgtm (just a clarification of wording though, "kube-state-metrics" is an external component, that converts kube API objects into Prometheus style metrics, it doesn't do anything within core components)

adambkaplan · 2020-04-28T18:43:26Z

@openshift/openshift-team-developer-experience this has thumbs up from the monitoring team - ptal.

ricardomaraschini

/lgtm

openshift-ci-robot · 2020-04-29T08:10:21Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, ricardomaraschini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [adambkaplan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2020-04-29T09:59:41Z

@adambkaplan: All pull requests linked via external trackers have merged: openshift/openshift-controller-manager#95. Bugzilla bug 1825324 has been moved to the MODIFIED state.

In response to this:

Bug 1825324: Use named queues for all controllers

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

adambkaplan · 2020-05-07T11:04:28Z

/cherry-pick release-4.4

openshift-cherrypick-robot · 2020-05-07T11:04:43Z

@adambkaplan: new pull request created: #104

In response to this:

/cherry-pick release-4.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Move component to an appropriate upgrade order (generic)

Bug 1825324: Use named queues for all controllers

dfdc5e5

* Add named queues for all ocm controllers * This exposes the workqueue_* metrics to kube-state-metrics

openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. labels Apr 24, 2020

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 24, 2020

openshift-ci-robot requested review from csrwng and ironcladlou April 24, 2020 17:52

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2020

adambkaplan commented Apr 27, 2020

View reviewed changes

openshift-ci-robot requested review from tnozicka, dmage and deads2k April 27, 2020 13:39

adambkaplan changed the title ~~WIP - Bug 1825324: Use named queues for all controllers~~ Bug 1825324: Use named queues for all controllers Apr 27, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 27, 2020

ricardomaraschini approved these changes Apr 29, 2020

View reviewed changes

openshift-ci-robot assigned ricardomaraschini Apr 29, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2020

openshift-merge-robot merged commit eb2aef2 into openshift:master Apr 29, 2020

openshift-cherrypick-robot mentioned this pull request May 7, 2020

Bug 1832839: Use named queues for all controllers #104

Merged

stlaz pushed a commit to stlaz/openshift-controller-manager that referenced this pull request Jul 29, 2021

Merge pull request openshift#95 from smarterclayton/move_order

da380be

Move component to an appropriate upgrade order (generic)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1825324: Use named queues for all controllers #95

Bug 1825324: Use named queues for all controllers #95

adambkaplan commented Apr 24, 2020

openshift-ci-robot commented Apr 24, 2020

adambkaplan commented Apr 27, 2020

adambkaplan left a comment

adambkaplan Apr 27, 2020

adambkaplan Apr 27, 2020

adambkaplan Apr 27, 2020

adambkaplan Apr 27, 2020

adambkaplan Apr 27, 2020

adambkaplan Apr 27, 2020

brancz commented Apr 27, 2020

adambkaplan commented Apr 28, 2020

ricardomaraschini left a comment

openshift-ci-robot commented Apr 29, 2020

openshift-ci-robot commented Apr 29, 2020

adambkaplan commented May 7, 2020

openshift-cherrypick-robot commented May 7, 2020

Bug 1825324: Use named queues for all controllers #95

Bug 1825324: Use named queues for all controllers #95

Conversation

adambkaplan commented Apr 24, 2020

openshift-ci-robot commented Apr 24, 2020

adambkaplan commented Apr 27, 2020

adambkaplan left a comment

Choose a reason for hiding this comment

adambkaplan Apr 27, 2020

Choose a reason for hiding this comment

adambkaplan Apr 27, 2020

Choose a reason for hiding this comment

adambkaplan Apr 27, 2020

Choose a reason for hiding this comment

adambkaplan Apr 27, 2020

Choose a reason for hiding this comment

adambkaplan Apr 27, 2020

Choose a reason for hiding this comment

adambkaplan Apr 27, 2020

Choose a reason for hiding this comment

brancz commented Apr 27, 2020

adambkaplan commented Apr 28, 2020

ricardomaraschini left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Apr 29, 2020

openshift-ci-robot commented Apr 29, 2020

adambkaplan commented May 7, 2020

openshift-cherrypick-robot commented May 7, 2020