github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix error log

pull/8/head
foxyriver 2018-07-26 19:48:48 +08:00
parent ad97a03e73
commit 3b4f250c4a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/scheduler/core/scheduling_queue.go
View File

@ -267,7 +267,7 @@ func (p *PriorityQueue) AddIfNotPresent(pod *v1.Pod) error {
} }
err := p.activeQ.Add(pod) err := p.activeQ.Add(pod)
if err != nil { if err != nil {
glog.Errorf("Error adding pod %v to the scheduling queue: %v", pod.Name, err) glog.Errorf("Error adding pod %v/%v to the scheduling queue: %v", pod.Namespace, pod.Name, err)
} else { } else {
p.addNominatedPodIfNeeded(pod) p.addNominatedPodIfNeeded(pod)
p.cond.Broadcast() p.cond.Broadcast()
@ -410,7 +410,7 @@ func (p *PriorityQueue) MoveAllToActiveQueue() {
defer p.lock.Unlock() defer p.lock.Unlock()
for _, pod := range p.unschedulableQ.pods { for _, pod := range p.unschedulableQ.pods {
if err := p.activeQ.Add(pod); err != nil { if err := p.activeQ.Add(pod); err != nil {
glog.Errorf("Error adding pod %v to the scheduling queue: %v", pod.Name, err) glog.Errorf("Error adding pod %v/%v to the scheduling queue: %v", pod.Namespace, pod.Name, err)
} }
} }
p.unschedulableQ.clear() p.unschedulableQ.clear()
@ -425,7 +425,7 @@ func (p *PriorityQueue) movePodsToActiveQueue(pods []*v1.Pod) {
if err := p.activeQ.Add(pod); err == nil { if err := p.activeQ.Add(pod); err == nil {
p.unschedulableQ.delete(pod) p.unschedulableQ.delete(pod)
} else { } else {
glog.Errorf("Error adding pod %v to the scheduling queue: %v", pod.Name, err) glog.Errorf("Error adding pod %v/%v to the scheduling queue: %v", pod.Namespace, pod.Name, err)
} }
} }
p.receivedMoveRequest = true p.receivedMoveRequest = true

2
pkg/scheduler/factory/factory.go
View File

@ -1191,7 +1191,7 @@ func (c *configFactory) getPluginArgs() (*PluginFactoryArgs, error) {
func (c *configFactory) getNextPod() *v1.Pod { func (c *configFactory) getNextPod() *v1.Pod {
pod, err := c.podQueue.Pop() pod, err := c.podQueue.Pop()
if err == nil { if err == nil {
glog.V(4).Infof("About to try and schedule pod %v", pod.Name) glog.V(4).Infof("About to try and schedule pod %v/%v", pod.Namespace, pod.Name)
return pod return pod
} }
glog.Errorf("Error while retrieving next pod from scheduling queue: %v", err) glog.Errorf("Error while retrieving next pod from scheduling queue: %v", err)

2
pkg/scheduler/scheduler.go
View File

@ -232,7 +232,7 @@ func (sched *Scheduler) preempt(preemptor *v1.Pod, scheduleErr error) (string, e
nodeName = node.Name nodeName = node.Name
err = sched.config.PodPreemptor.SetNominatedNodeName(preemptor, nodeName) err = sched.config.PodPreemptor.SetNominatedNodeName(preemptor, nodeName)
if err != nil { if err != nil {
glog.Errorf("Error in preemption process. Cannot update pod %v annotations: %v", preemptor.Name, err) glog.Errorf("Error in preemption process. Cannot update pod %v/%v annotations: %v", preemptor.Namespace, preemptor.Name, err)
return "", err return "", err
} }
for _, victim := range victims { for _, victim := range victims {