From 282973d87d1adb85ffe7ec6d8e0f9c40340228ea Mon Sep 17 00:00:00 2001
From: Harry Zhang <harryz@hyper.sh>
Date: Wed, 27 Sep 2017 16:08:23 +0800
Subject: [PATCH] Elimenate extra CRI call

---
 pkg/kubelet/cm/cpumanager/cpu_manager.go      | 13 +++++++++----
 pkg/kubelet/cm/cpumanager/cpu_manager_test.go |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager.go b/pkg/kubelet/cm/cpumanager/cpu_manager.go
index aade9f9266..353f5ee1e0 100644
--- a/pkg/kubelet/cm/cpumanager/cpu_manager.go
+++ b/pkg/kubelet/cm/cpumanager/cpu_manager.go
@@ -176,11 +176,16 @@ func (m *manager) AddContainer(p *v1.Pod, c *v1.Container, containerID string) e
 	cpus := m.state.GetCPUSetOrDefault(containerID)
 	m.Unlock()
 
-	err = m.updateContainerCPUSet(containerID, cpus)
-	if err != nil {
-		glog.Errorf("[cpumanager] AddContainer error: %v", err)
-		return err
+	if !cpus.IsEmpty() {
+		err = m.updateContainerCPUSet(containerID, cpus)
+		if err != nil {
+			glog.Errorf("[cpumanager] AddContainer error: %v", err)
+			return err
+		}
+	} else {
+		glog.V(5).Infof("[cpumanager] update container resources is skipped due to cpu set is empty")
 	}
+
 	return nil
 }
 
diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go
index e432de0360..a763bbfaf3 100644
--- a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go
+++ b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go
@@ -180,7 +180,7 @@ func TestCPUManagerAdd(t *testing.T) {
 			description: "cpu manager add - container update error",
 			regErr:      nil,
 			updateErr:   fmt.Errorf("fake update error"),
-			expErr:      fmt.Errorf("fake update error"),
+			expErr:      nil,
 		},
 	}