github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25863 from ping035627/ping035627-patch-2

Browse Source 
Automatic merge from submit-queue

Fix the bug of the "removePod" function in node_info.go
This commit is contained in:
k8s-merge-robot 2016-05-21 21:34:28 -07:00
commit 529135dd01
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/pkg/scheduler/schedulercache/node_info.go
View File

@ -132,13 +132,6 @@ func (n *NodeInfo) removePod(pod *api.Pod) error {
return err
}
cpu, mem, nvidia_gpu, non0_cpu, non0_mem := calculateResource(pod)
n.requestedResource.MilliCPU -= cpu
n.requestedResource.Memory -= mem
n.requestedResource.NvidiaGPU -= nvidia_gpu
n.nonzeroRequest.MilliCPU -= non0_cpu
n.nonzeroRequest.Memory -= non0_mem
for i := range n.pods {
k2, err := getPodKey(n.pods[i])
if err != nil {
@ -149,10 +142,17 @@ func (n *NodeInfo) removePod(pod *api.Pod) error {
// delete the element
n.pods[i] = n.pods[len(n.pods)-1]
n.pods = n.pods[:len(n.pods)-1]
// reduce the resource data
cpu, mem, nvidia_gpu, non0_cpu, non0_mem := calculateResource(pod)
n.requestedResource.MilliCPU -= cpu
n.requestedResource.Memory -= mem
n.requestedResource.NvidiaGPU -= nvidia_gpu
n.nonzeroRequest.MilliCPU -= non0_cpu
n.nonzeroRequest.Memory -= non0_mem
return nil
}
}
return fmt.Errorf("no corresponding pod in pods")
return fmt.Errorf("no corresponding pod %s in pods of node %s", pod.Name, n.node.Name)
}
func calculateResource(pod *api.Pod) (cpu int64, mem int64, nvidia_gpu int64, non0_cpu int64, non0_mem int64) {