From 4317173d3f5bbb58b06a3825fe1e0dc7bd58490f Mon Sep 17 00:00:00 2001 From: deads2k Date: Mon, 22 Aug 2016 14:15:45 -0400 Subject: [PATCH] add names for workqueues to gather controller latency/depth metrics --- pkg/controller/certificates/controller.go | 2 +- pkg/controller/daemon/daemoncontroller.go | 2 +- pkg/controller/deployment/deployment_controller.go | 2 +- pkg/controller/disruption/disruption.go | 2 +- pkg/controller/endpoint/endpoints_controller.go | 2 +- pkg/controller/job/jobcontroller.go | 2 +- pkg/controller/namespace/namespace_controller.go | 2 +- pkg/controller/petset/pet_set.go | 2 +- pkg/controller/replicaset/replica_set.go | 2 +- pkg/controller/replication/replication_controller.go | 2 +- pkg/controller/resourcequota/resource_quota_controller.go | 4 ++-- pkg/controller/serviceaccount/tokens_controller.go | 4 ++-- plugin/pkg/admission/resourcequota/controller.go | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/controller/certificates/controller.go b/pkg/controller/certificates/controller.go index 05f654c2134..430d50e04cb 100644 --- a/pkg/controller/certificates/controller.go +++ b/pkg/controller/certificates/controller.go @@ -79,7 +79,7 @@ func NewCertificateController(kubeClient clientset.Interface, syncPeriod time.Du cc := &CertificateController{ kubeClient: kubeClient, - queue: workqueue.New(), + queue: workqueue.NewNamed("certificate"), signer: ca, approveAllKubeletCSRsForGroup: approveAllKubeletCSRsForGroup, } diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index 3a528de59a8..4f95703b2cb 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -125,7 +125,7 @@ func NewDaemonSetsController(podInformer framework.SharedIndexInformer, kubeClie }, burstReplicas: BurstReplicas, expectations: controller.NewControllerExpectations(), - queue: workqueue.New(), + queue: workqueue.NewNamed("daemonset"), } // Manage addition/update of daemon sets. dsc.dsStore.Store, dsc.dsController = framework.NewInformer( diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 313dc460b16..a69a61b7f00 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -107,7 +107,7 @@ func NewDeploymentController(client clientset.Interface, resyncPeriod controller dc := &DeploymentController{ client: client, eventRecorder: eventBroadcaster.NewRecorder(api.EventSource{Component: "deployment-controller"}), - queue: workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()), + queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "deployment"), } dc.dStore.Indexer, dc.dController = framework.NewIndexerInformer( diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index ae62849e14b..a8e6bc350d1 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -88,7 +88,7 @@ func NewDisruptionController(podInformer framework.SharedIndexInformer, kubeClie dc := &DisruptionController{ kubeClient: kubeClient, podController: podInformer.GetController(), - queue: workqueue.New(), + queue: workqueue.NewNamed("disruption"), broadcaster: record.NewBroadcaster(), } dc.recorder = dc.broadcaster.NewRecorder(api.EventSource{Component: "controllermanager"}) diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index 56a5dddf79f..06eb1768a6a 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -76,7 +76,7 @@ func NewEndpointController(podInformer framework.SharedIndexInformer, client *cl } e := &EndpointController{ client: client, - queue: workqueue.New(), + queue: workqueue.NewNamed("endpoint"), } e.serviceStore.Store, e.serviceController = framework.NewInformer( diff --git a/pkg/controller/job/jobcontroller.go b/pkg/controller/job/jobcontroller.go index cfb353915d9..a11f5b24fe0 100644 --- a/pkg/controller/job/jobcontroller.go +++ b/pkg/controller/job/jobcontroller.go @@ -94,7 +94,7 @@ func NewJobController(podInformer framework.SharedIndexInformer, kubeClient clie Recorder: eventBroadcaster.NewRecorder(api.EventSource{Component: "job-controller"}), }, expectations: controller.NewControllerExpectations(), - queue: workqueue.New(), + queue: workqueue.NewNamed("job"), recorder: eventBroadcaster.NewRecorder(api.EventSource{Component: "job-controller"}), } diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index e65ccb1bb49..a7675f93760 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -67,7 +67,7 @@ func NewNamespaceController( namespaceController := &NamespaceController{ kubeClient: kubeClient, clientPool: clientPool, - queue: workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()), + queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "namespace"), groupVersionResources: groupVersionResources, opCache: operationNotSupportedCache{}, finalizerToken: finalizerToken, diff --git a/pkg/controller/petset/pet_set.go b/pkg/controller/petset/pet_set.go index 25c1a44bda8..9a63e90b5dd 100644 --- a/pkg/controller/petset/pet_set.go +++ b/pkg/controller/petset/pet_set.go @@ -94,7 +94,7 @@ func NewPetSetController(podInformer framework.SharedIndexInformer, kubeClient * newSyncer: func(blockingPet *pcb) *petSyncer { return &petSyncer{pc, blockingPet} }, - queue: workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()), + queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "petset"), } podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index 2efd4a2358a..e8a04acba60 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -139,7 +139,7 @@ func newReplicaSetController(eventRecorder record.EventRecorder, podInformer fra }, burstReplicas: burstReplicas, expectations: controller.NewUIDTrackingControllerExpectations(controller.NewControllerExpectations()), - queue: workqueue.New(), + queue: workqueue.NewNamed("replicaset"), garbageCollectorEnabled: garbageCollectorEnabled, } diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index da06830b546..511c5d92612 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -143,7 +143,7 @@ func newReplicationManager(eventRecorder record.EventRecorder, podInformer frame }, burstReplicas: burstReplicas, expectations: controller.NewUIDTrackingControllerExpectations(controller.NewControllerExpectations()), - queue: workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()), + queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "replicationmanager"), garbageCollectorEnabled: garbageCollectorEnabled, } diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index 99940fc20e2..8b01ef86754 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -79,8 +79,8 @@ func NewResourceQuotaController(options *ResourceQuotaControllerOptions) *Resour // build the resource quota controller rq := &ResourceQuotaController{ kubeClient: options.KubeClient, - queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "controller_resourcequota_primary"), - missingUsageQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "controller_resourcequota_priority"), + queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "resourcequota_primary"), + missingUsageQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "resourcequota_priority"), resyncPeriod: options.ResyncPeriod, registry: options.Registry, replenishmentControllers: []framework.ControllerInterface{}, diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index 4c3f4fba0d7..cdaf1411676 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -81,8 +81,8 @@ func NewTokensController(cl clientset.Interface, options TokensControllerOptions token: options.TokenGenerator, rootCA: options.RootCA, - syncServiceAccountQueue: workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()), - syncSecretQueue: workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()), + syncServiceAccountQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "serviceaccount_tokens_service"), + syncSecretQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "serviceaccount_tokens_secret"), maxRetries: maxRetries, } diff --git a/plugin/pkg/admission/resourcequota/controller.go b/plugin/pkg/admission/resourcequota/controller.go index 770d93589ac..e259af6a1ea 100644 --- a/plugin/pkg/admission/resourcequota/controller.go +++ b/plugin/pkg/admission/resourcequota/controller.go @@ -105,7 +105,7 @@ func NewQuotaEvaluator(quotaAccessor QuotaAccessor, registry quota.Registry, loc registry: registry, - queue: workqueue.New(), + queue: workqueue.NewNamed("admission_quota_controller"), work: map[string][]*admissionWaiter{}, dirtyWork: map[string][]*admissionWaiter{}, inProgress: sets.String{},