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

Update node_info.go

Browse Source
This commit is contained in:
PingWang 2016-05-20 09:07:43 +08:00
parent 85f1e0ea6a
commit 901011f242
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,7 @@ func (n *NodeInfo) removePod(pod *api.Pod) error {
for i := range n.pods { for i := range n.pods {
k2, err := getPodKey(n.pods[i]) k2, err := getPodKey(n.pods[i])
if err != nil { if err != nil {
glog.Errorf("Cannot get node.pod(%s/%s) key, err: %v", n.pods[i].Namespace, n.pods[i].Name, err) glog.Errorf("Cannot get pod key, err: %v", err)
continue continue
} }
if k1 == k2 { if k1 == k2 {
@ -152,7 +152,7 @@ func (n *NodeInfo) removePod(pod *api.Pod) error {
return nil return nil
} }
} }
return fmt.Errorf("no corresponding pod(%s/%s) in pods of node(%s)", pod.Namespace, pod.Name, n.node.Name) 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) { func calculateResource(pod *api.Pod) (cpu int64, mem int64, nvidia_gpu int64, non0_cpu int64, non0_mem int64) {