From 63825952219335250b168626a856f6fb3b15675c Mon Sep 17 00:00:00 2001
From: draveness <i@draveness.me>
Date: Mon, 6 May 2019 11:52:05 +0800
Subject: [PATCH] feat: move klog from AddUnschedulableIfNotPresent into the
 call site

---
 pkg/scheduler/factory/factory.go                 | 4 +++-
 pkg/scheduler/internal/queue/scheduling_queue.go | 5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkg/scheduler/factory/factory.go b/pkg/scheduler/factory/factory.go
index 46ab49386d..dc8066a899 100644
--- a/pkg/scheduler/factory/factory.go
+++ b/pkg/scheduler/factory/factory.go
@@ -682,7 +682,9 @@ func MakeDefaultErrorFunc(client clientset.Interface, podQueue internalqueue.Sch
 				pod, err := client.CoreV1().Pods(podID.Namespace).Get(podID.Name, metav1.GetOptions{})
 				if err == nil {
 					if len(pod.Spec.NodeName) == 0 {
-						podQueue.AddUnschedulableIfNotPresent(pod, podSchedulingCycle)
+						if err := podQueue.AddUnschedulableIfNotPresent(pod, podSchedulingCycle); err != nil {
+							klog.Error(err)
+						}
 					}
 					break
 				}
diff --git a/pkg/scheduler/internal/queue/scheduling_queue.go b/pkg/scheduler/internal/queue/scheduling_queue.go
index 41a41c15a4..07310e8414 100644
--- a/pkg/scheduler/internal/queue/scheduling_queue.go
+++ b/pkg/scheduler/internal/queue/scheduling_queue.go
@@ -313,10 +313,7 @@ func (p *PriorityQueue) AddUnschedulableIfNotPresent(pod *v1.Pod, podSchedulingC
 	// it to unschedulableQ.
 	if p.moveRequestCycle >= podSchedulingCycle {
 		if err := p.podBackoffQ.Add(pInfo); err != nil {
-			// TODO: Delete this klog call and log returned errors at the call site.
-			err = fmt.Errorf("error adding pod %v to the backoff queue: %v", pod.Name, err)
-			klog.Error(err)
-			return err
+			return fmt.Errorf("error adding pod %v to the backoff queue: %v", pod.Name, err)
 		}
 	} else {
 		p.unschedulableQ.addOrUpdate(pInfo)