From b247240ad7aa5ff47bb6c7adc93dfd0c952dc814 Mon Sep 17 00:00:00 2001
From: lala123912 <guoxiaofeng@huawei.com>
Date: Fri, 12 Mar 2021 10:41:03 +0800
Subject: [PATCH] Migrate pkg/kubelet/cm/cpumanage/{topology/topology.go,
 policy_none.go, cpu_assignment.go} to structured logging

---
 pkg/kubelet/cm/cpumanager/cpu_assignment.go    | 6 +++---
 pkg/kubelet/cm/cpumanager/policy_none.go       | 2 +-
 pkg/kubelet/cm/cpumanager/topology/topology.go | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg/kubelet/cm/cpumanager/cpu_assignment.go b/pkg/kubelet/cm/cpumanager/cpu_assignment.go
index f646f80811a..cb4b9807529 100644
--- a/pkg/kubelet/cm/cpumanager/cpu_assignment.go
+++ b/pkg/kubelet/cm/cpumanager/cpu_assignment.go
@@ -160,7 +160,7 @@ func takeByTopology(topo *topology.CPUTopology, availableCPUs cpuset.CPUSet, num
 	//    least a socket's-worth of CPUs.
 	if acc.needs(acc.topo.CPUsPerSocket()) {
 		for _, s := range acc.freeSockets() {
-			klog.V(4).Infof("[cpumanager] takeByTopology: claiming socket [%d]", s)
+			klog.V(4).InfoS("takeByTopology: claiming socket", "socket", s)
 			acc.take(acc.details.CPUsInSockets(s))
 			if acc.isSatisfied() {
 				return acc.result, nil
@@ -175,7 +175,7 @@ func takeByTopology(topo *topology.CPUTopology, availableCPUs cpuset.CPUSet, num
 	//    a core's-worth of CPUs.
 	if acc.needs(acc.topo.CPUsPerCore()) {
 		for _, c := range acc.freeCores() {
-			klog.V(4).Infof("[cpumanager] takeByTopology: claiming core [%d]", c)
+			klog.V(4).InfoS("takeByTopology: claiming core", "core", c)
 			acc.take(acc.details.CPUsInCores(c))
 			if acc.isSatisfied() {
 				return acc.result, nil
@@ -190,7 +190,7 @@ func takeByTopology(topo *topology.CPUTopology, availableCPUs cpuset.CPUSet, num
 	//    on the same sockets as the whole cores we have already taken in this
 	//    allocation.
 	for _, c := range acc.freeCPUs() {
-		klog.V(4).Infof("[cpumanager] takeByTopology: claiming CPU [%d]", c)
+		klog.V(4).InfoS("takeByTopology: claiming CPU", "cpu", c)
 		if acc.needs(1) {
 			acc.take(cpuset.NewCPUSet(c))
 		}
diff --git a/pkg/kubelet/cm/cpumanager/policy_none.go b/pkg/kubelet/cm/cpumanager/policy_none.go
index 5b8f094d2d6..345d4c14d6d 100644
--- a/pkg/kubelet/cm/cpumanager/policy_none.go
+++ b/pkg/kubelet/cm/cpumanager/policy_none.go
@@ -41,7 +41,7 @@ func (p *nonePolicy) Name() string {
 }
 
 func (p *nonePolicy) Start(s state.State) error {
-	klog.Info("[cpumanager] none policy: Start")
+	klog.InfoS("None policy: Start")
 	return nil
 }
 
diff --git a/pkg/kubelet/cm/cpumanager/topology/topology.go b/pkg/kubelet/cm/cpumanager/topology/topology.go
index 1475f758959..b397165d97e 100644
--- a/pkg/kubelet/cm/cpumanager/topology/topology.go
+++ b/pkg/kubelet/cm/cpumanager/topology/topology.go
@@ -236,8 +236,7 @@ func Discover(machineInfo *cadvisorapi.MachineInfo) (*CPUTopology, error) {
 					}
 				}
 			} else {
-				klog.Errorf("could not get unique coreID for socket: %d core %d threads: %v",
-					core.SocketID, core.Id, core.Threads)
+				klog.ErrorS(nil, "Could not get unique coreID for socket", "socket", core.SocketID, "core", core.Id, "threads", core.Threads)
 				return nil, err
 			}
 		}