Skip to content

Changing MCM queues to rate-limiting queues #1049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Changing MCM queues to rate-limiting queues #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33ac2fc
added rate limiting queues and refactored code to remove dead code
r4mek Nov 6, 2025
eed5a47
rebase fixes
r4mek Nov 6, 2025
5c8f540
changing the minDelay for rate-limiting queues to 5s and handling the…
r4mek Nov 26, 2025
0711662
minor changes
r4mek Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions pkg/util/provider/machinecontroller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/gardener/machine-controller-manager/pkg/util/provider/driver"
"github.com/gardener/machine-controller-manager/pkg/util/provider/options"
"github.com/gardener/machine-controller-manager/pkg/util/worker"
"golang.org/x/time/rate"

machineinternal "github.com/gardener/machine-controller-manager/pkg/apis/machine"
machinev1alpha1 "github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1"
Expand Down Expand Up @@ -84,31 +85,31 @@ func NewController(
targetCoreClient: targetCoreClient,
recorder: recorder,
secretQueue: workqueue.NewTypedRateLimitingQueueWithConfig(
workqueue.DefaultTypedControllerRateLimiter[string](),
CustomTypedControllerRateLimiter[string](safetyOptions.MachineHealthTimeout.Duration),
workqueue.TypedRateLimitingQueueConfig[string]{Name: "secret"},
),
nodeQueue: workqueue.NewTypedRateLimitingQueueWithConfig(
workqueue.DefaultTypedControllerRateLimiter[string](),
CustomTypedControllerRateLimiter[string](safetyOptions.MachineHealthTimeout.Duration),
workqueue.TypedRateLimitingQueueConfig[string]{Name: "node"},
),
machineClassQueue: workqueue.NewTypedRateLimitingQueueWithConfig(
workqueue.DefaultTypedControllerRateLimiter[string](),
CustomTypedControllerRateLimiter[string](safetyOptions.MachineHealthTimeout.Duration),
workqueue.TypedRateLimitingQueueConfig[string]{Name: "machineclass"},
),
machineQueue: workqueue.NewTypedRateLimitingQueueWithConfig(
workqueue.DefaultTypedControllerRateLimiter[string](),
CustomTypedControllerRateLimiter[string](safetyOptions.MachineHealthTimeout.Duration),
workqueue.TypedRateLimitingQueueConfig[string]{Name: "machine"},
),
machineTerminationQueue: workqueue.NewTypedRateLimitingQueueWithConfig(
workqueue.DefaultTypedControllerRateLimiter[string](),
CustomTypedControllerRateLimiter[string](safetyOptions.MachineHealthTimeout.Duration),
workqueue.TypedRateLimitingQueueConfig[string]{Name: "machinetermination"},
),
machineSafetyOrphanVMsQueue: workqueue.NewTypedRateLimitingQueueWithConfig(
workqueue.DefaultTypedControllerRateLimiter[string](),
CustomTypedControllerRateLimiter[string](safetyOptions.MachineHealthTimeout.Duration),
workqueue.TypedRateLimitingQueueConfig[string]{Name: "machinesafetyorphanvms"},
),
machineSafetyAPIServerQueue: workqueue.NewTypedRateLimitingQueueWithConfig(
workqueue.DefaultTypedControllerRateLimiter[string](),
CustomTypedControllerRateLimiter[string](safetyOptions.MachineHealthTimeout.Duration),
workqueue.TypedRateLimitingQueueConfig[string]{Name: "machinesafetyapiserver"},
),
safetyOptions: safetyOptions,
Expand Down Expand Up @@ -361,3 +362,14 @@ func (dc *controller) Run(workers int, stopCh <-chan struct{}) {

waitGroup.Wait()
}

// CustomTypedControllerRateLimiter is a constructor for a custom rate limiter for a workqueue. It has
// both overall and per-item rate limiting. The overall is a token bucket and the per-item is exponential.
// It is more configurable than DefaultTypedControllerRateLimiter and takes in machineHealthTimeout to be used as limit for item rate-limiter
func CustomTypedControllerRateLimiter[T comparable](maxDelay time.Duration) workqueue.TypedRateLimiter[T] {
return workqueue.NewTypedMaxOfRateLimiter(
workqueue.NewTypedItemExponentialFailureRateLimiter[T](5*time.Second, maxDelay),
// 10 qps, 100 bucket size. This is only for retry speed and its only the overall factor (not per item)
&workqueue.TypedBucketRateLimiter[T]{Limiter: rate.NewLimiter(rate.Limit(10), 100)},
)
}
Loading
Loading