github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19527 from hongchaodeng/pred

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-17 03:52:16 -08:00
parent bd8d37f6f2 252a956150
commit 98b190acf4
4 changed files with 68 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugin/pkg/scheduler/algorithm/predicates/predicates.go
View File

@@ -256,8 +256,6 @@ type resourceRequest struct {
memory int64
}
var FailedResourceType string
func getResourceRequest(pod *api.Pod) resourceRequest {
result := resourceRequest{}
for _, container := range pod.Spec.Containers {
@@ -308,8 +306,7 @@ func (r *ResourceFit) PodFitsResources(pod *api.Pod, existingPods []*api.Pod, no
if int64(len(existingPods))+1 > info.Status.Capacity.Pods().Value() {
glog.V(10).Infof("Cannot schedule Pod %+v, because Node %+v is full, running %v out of %v Pods.", podName(pod), node, len(existingPods), info.Status.Capacity.Pods().Value())
FailedResourceType = "PodExceedsMaxPodNumber"
return false, nil
return false, ErrExceededMaxPodNumber
}
podRequest := getResourceRequest(pod)
@@ -321,13 +318,11 @@ func (r *ResourceFit) PodFitsResources(pod *api.Pod, existingPods []*api.Pod, no
_, exceedingCPU, exceedingMemory := CheckPodsExceedingFreeResources(pods, info.Status.Capacity)
if len(exceedingCPU) > 0 {
glog.V(10).Infof("Cannot schedule Pod %+v, because Node %v does not have sufficient CPU", podName(pod), node)
FailedResourceType = "PodExceedsFreeCPU"
return false, nil
return false, ErrInsufficientFreeCPU
}
if len(exceedingMemory) > 0 {
glog.V(10).Infof("Cannot schedule Pod %+v, because Node %v does not have sufficient Memory", podName(pod), node)
FailedResourceType = "PodExceedsFreeMemory"
return false, nil
return false, ErrInsufficientFreeMemory
}
glog.V(10).Infof("Schedule Pod %+v on Node %+v is allowed, Node is running only %v out of %v Pods.", podName(pod), node, len(pods)-1, info.Status.Capacity.Pods().Value())
return true, nil