github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101276 from BinacsLee/binacs-pkg-scheduler-fwk-types-cleanup

Browse Source 
code cleanup: pkg/scheduler modify framework/types.go
This commit is contained in:
Kubernetes Prow Robot 2021-04-20 17:38:12 -07:00 committed by GitHub
commit badb5730d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/scheduler/framework/types.go
View File

@ -86,10 +86,7 @@ type ClusterEvent struct {
// IsWildCard returns true if ClusterEvent follows WildCard semantics // IsWildCard returns true if ClusterEvent follows WildCard semantics
func (ce ClusterEvent) IsWildCard() bool { func (ce ClusterEvent) IsWildCard() bool {
if ce.Resource == WildCard && ce.ActionType == All { return ce.Resource == WildCard && ce.ActionType == All
return true
}
return false
} }
// QueuedPodInfo is a Pod wrapper with additional information related to // QueuedPodInfo is a Pod wrapper with additional information related to
@ -776,6 +773,13 @@ func (n *NodeInfo) resetSlicesIfEmpty() {
} }
} }
func max(a, b int64) int64 {
if a >= b {
return a
}
return b
}
// resourceRequest = max(sum(podSpec.Containers), podSpec.InitContainers) + overHead // resourceRequest = max(sum(podSpec.Containers), podSpec.InitContainers) + overHead
func calculateResource(pod *v1.Pod) (res Resource, non0CPU int64, non0Mem int64) { func calculateResource(pod *v1.Pod) (res Resource, non0CPU int64, non0Mem int64) {
resPtr := &res resPtr := &res
@ -790,13 +794,8 @@ func calculateResource(pod *v1.Pod) (res Resource, non0CPU int64, non0Mem int64)
for _, ic := range pod.Spec.InitContainers { for _, ic := range pod.Spec.InitContainers {
resPtr.SetMaxResource(ic.Resources.Requests) resPtr.SetMaxResource(ic.Resources.Requests)
non0CPUReq, non0MemReq := schedutil.GetNonzeroRequests(&ic.Resources.Requests) non0CPUReq, non0MemReq := schedutil.GetNonzeroRequests(&ic.Resources.Requests)
if non0CPU < non0CPUReq { non0CPU = max(non0CPU, non0CPUReq)
non0CPU = non0CPUReq non0Mem = max(non0Mem, non0MemReq)
}
if non0Mem < non0MemReq {
non0Mem = non0MemReq
}
} }
// If Overhead is being utilized, add to the total requests for the pod // If Overhead is being utilized, add to the total requests for the pod