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

Merge pull request #77478 from draveness/feature/remove-log-in-scheduler 

feat: remove klog in AddUnschedulableIfNotPresent
k3s-v1.15.3
Kubernetes Prow Robot 2019-05-07 01:45:49 -07:00 committed by GitHub
parent 43284ecbfc 6382595221
commit a1588cfe34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -682,7 +682,9 @@ func MakeDefaultErrorFunc(client clientset.Interface, podQueue internalqueue.Sch
pod, err := client.CoreV1().Pods(podID.Namespace).Get(podID.Name, metav1.GetOptions{}) pod, err := client.CoreV1().Pods(podID.Namespace).Get(podID.Name, metav1.GetOptions{})
if err == nil { if err == nil {
if len(pod.Spec.NodeName) == 0 { if len(pod.Spec.NodeName) == 0 {
podQueue.AddUnschedulableIfNotPresent(pod, podSchedulingCycle) if err := podQueue.AddUnschedulableIfNotPresent(pod, podSchedulingCycle); err != nil {
klog.Error(err)
}
} }
break break
} }

5
pkg/scheduler/internal/queue/scheduling_queue.go
View File

@ -313,10 +313,7 @@ func (p *PriorityQueue) AddUnschedulableIfNotPresent(pod *v1.Pod, podSchedulingC
// it to unschedulableQ. // it to unschedulableQ.
if p.moveRequestCycle >= podSchedulingCycle { if p.moveRequestCycle >= podSchedulingCycle {
if err := p.podBackoffQ.Add(pInfo); err != nil { if err := p.podBackoffQ.Add(pInfo); err != nil {
// TODO: Delete this klog call and log returned errors at the call site. return fmt.Errorf("error adding pod %v to the backoff queue: %v", pod.Name, err)
err = fmt.Errorf("error adding pod %v to the backoff queue: %v", pod.Name, err)
klog.Error(err)
return err
} }
} else { } else {
p.unschedulableQ.addOrUpdate(pInfo) p.unschedulableQ.addOrUpdate(pInfo)