-
Notifications
You must be signed in to change notification settings - Fork 38.6k
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
feat: cache pod limits as part of metadata in priority functions #77498
Merged
k8s-ci-robot
merged 1 commit into
kubernetes:master
from
draveness:feature/resource-limit-metadata
May 15, 2019
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,7 +42,14 @@ func ResourceLimitsPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedule | |
allocatableResources := nodeInfo.AllocatableResource() | ||
|
||
// compute pod limits | ||
podLimits := getResourceLimits(pod) | ||
var podLimits *schedulernodeinfo.Resource | ||
if priorityMeta, ok := meta.(*priorityMetadata); ok && priorityMeta != nil { | ||
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. [1] Fix a bug here. |
||
// We were able to parse metadata, use podLimits from there. | ||
podLimits = priorityMeta.podLimits | ||
} else { | ||
// We couldn't parse metadata - fallback to computing it. | ||
podLimits = getResourceLimits(pod) | ||
} | ||
|
||
cpuScore := computeScore(podLimits.MilliCPU, allocatableResources.MilliCPU) | ||
memScore := computeScore(podLimits.Memory, allocatableResources.Memory) | ||
|
@@ -83,7 +90,6 @@ func computeScore(limit, allocatable int64) int64 { | |
// The reason to create this new function is to be consistent with other | ||
// priority functions because most or perhaps all priority functions work | ||
// with schedulernodeinfo.Resource. | ||
// TODO: cache it as part of metadata passed to priority functions. | ||
func getResourceLimits(pod *v1.Pod) *schedulernodeinfo.Resource { | ||
result := &schedulernodeinfo.Resource{} | ||
for _, container := range pod.Spec.Containers { | ||
|
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.
Please move
getResourceLimits
to metadata as it doesn't belong here anymoreThere 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.
I add fallback logic when metadata is failed to convert to
priorityMetadata
which is consistent withresource_allocation.go
.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.
sgtm