Added rate limiting to pod deleting #6355
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -177,7 +177,7 @@ func (s *CMServer) Run(_ []string) error { | |||
| } | |||
|
|
|||
| nodeController := nodeControllerPkg.NewNodeController(cloud, s.MinionRegexp, s.MachineList, nodeResources, | |||
| kubeClient, kubeletClient, s.RegisterRetryCount, s.PodEvictionTimeout) | |||
| kubeClient, kubeletClient, s.RegisterRetryCount, s.PodEvictionTimeout, util.NewTokenBucketRateLimiter(0.01, 10)) | |||
There was a problem hiding this comment.
Can you make them flags here too?
|
LGTM, modulo the flags comment. If you get to it tonight, that's great. Otherwise, I'll merge later today and we can handle the flags as a follow on PR. |
brendandburns
added
the
lgtm
|
I'll do in 3 hours. |
|
Can you please wait to merge until I've taken a look? I'll do it today. |
|
Could you please wait for David? |
piosz
changed the title
|
yes, will wait. --brendan |
| @@ -104,6 +106,8 @@ func (s *CMServer) AddFlags(fs *pflag.FlagSet) { | |||
| fs.DurationVar(&s.ResourceQuotaSyncPeriod, "resource_quota_sync_period", s.ResourceQuotaSyncPeriod, "The period for syncing quota usage status in the system") | |||
| fs.DurationVar(&s.NamespaceSyncPeriod, "namespace_sync_period", s.NamespaceSyncPeriod, "The period for syncing namespace life-cycle updates") | |||
| fs.DurationVar(&s.PodEvictionTimeout, "pod_eviction_timeout", s.PodEvictionTimeout, "The grace peroid for deleting pods on failed nodes.") | |||
| fs.Float32Var(&s.DeletingPodsQps, "deleting_pods_qps", 0.1, "Number of nodes per second on which pods are deleted in case of node failure.") | |||
| fs.IntVar(&s.DeletingPodsBurst, "deleting_pods_burst", 10, "Number of nodes on which pods are bursty deleted in case of node failure.") | |||
There was a problem hiding this comment.
Maybe define what "bursty deleted" means.
There was a problem hiding this comment.
Added note pointing to RateLimiter.
|
LGTM |
|
Rebased. |
|
Travis failure is a known race for which fix required this PR. Thanks, merging. |
gmarek
added a commit
that referenced
this pull request
Apr 3, 2015
Added rate limiting to pod deleting in NodeController.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6228