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.
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
Add request processing HPA into the queue after processing is finished. #72373
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -207,14 +207,18 @@ func (a *HorizontalController) processNextWorkItem() bool { | |
} | ||
defer a.queue.Done(key) | ||
|
||
err := a.reconcileKey(key.(string)) | ||
if err == nil { | ||
// don't "forget" here because we want to only process a given HPA once per resync interval | ||
return true | ||
deleted, err := a.reconcileKey(key.(string)) | ||
if err != nil { | ||
utilruntime.HandleError(err) | ||
} | ||
// Add request processing HPA after resync interval just in case last resync didn't insert | ||
// request into the queue. Request is not inserted into queue by resync if previous one wasn't processed yet. | ||
// This happens quite often because requests from previous resync are removed from the queue at the same moment | ||
// as next resync inserts new requests. | ||
if !deleted { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Am I reading this correctly that it always requeues items that still exist, even in non-error cases? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes, see comment below |
||
a.queue.AddRateLimited(key) | ||
} | ||
|
||
a.queue.AddRateLimited(key) | ||
utilruntime.HandleError(err) | ||
return true | ||
} | ||
|
||
|
@@ -298,20 +302,20 @@ func (a *HorizontalController) computeReplicasForMetrics(hpa *autoscalingv2.Hori | |
return replicas, metric, statuses, timestamp, nil | ||
} | ||
|
||
func (a *HorizontalController) reconcileKey(key string) error { | ||
func (a *HorizontalController) reconcileKey(key string) (deleted bool, err error) { | ||
namespace, name, err := cache.SplitMetaNamespaceKey(key) | ||
if err != nil { | ||
return err | ||
return true, err | ||
} | ||
|
||
hpa, err := a.hpaLister.HorizontalPodAutoscalers(namespace).Get(name) | ||
if errors.IsNotFound(err) { | ||
klog.Infof("Horizontal Pod Autoscaler %s has been deleted in %s", name, namespace) | ||
delete(a.recommendations, key) | ||
return nil | ||
return true, nil | ||
} | ||
|
||
return a.reconcileAutoscaler(hpa, key) | ||
return false, a.reconcileAutoscaler(hpa, key) | ||
} | ||
|
||
// computeStatusForObjectMetric computes the desired number of replicas for the specified metric of type ObjectMetricSourceType. | ||
|
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you should still have a comment as to why we're not forgetting the key, since this works significantly different from normal controllers.