From aed19e7829ee72fb644c4e78abafb4499a2c9614 Mon Sep 17 00:00:00 2001 From: acejilam Date: Mon, 25 Mar 2024 20:47:02 +0800 Subject: [PATCH] koordlet: fix some fmt err Signed-off-by: acejilam --- pkg/descheduler/controllers/migration/evict.go | 2 +- .../collectors/coldmemoryresource/cold_page_kidled.go | 4 ++-- pkg/koordlet/qosmanager/framework/pod_qos_control.go | 2 +- pkg/koordlet/qosmanager/plugins/cpuevict/cpu_evict.go | 4 ++-- pkg/koordlet/qosmanager/plugins/cpusuppress/cpu_suppress.go | 2 +- pkg/koordlet/runtimehooks/hooks/coresched/helper.go | 5 ++--- pkg/koordlet/runtimehooks/hooks/groupidentity/rule.go | 2 +- pkg/koordlet/runtimehooks/protocol/container_context.go | 6 +++--- pkg/koordlet/runtimehooks/rule/rule.go | 2 +- pkg/koordlet/statesinformer/impl/callback_runner.go | 2 +- pkg/koordlet/statesinformer/impl/states_pods.go | 2 +- pkg/koordlet/util/meminfo.go | 2 +- pkg/koordlet/util/system/config.go | 2 +- pkg/util/httputil/reverseproxy.go | 2 +- pkg/util/metrics/expire_metric.go | 4 ++-- pkg/webhook/api_debug_server.go | 2 +- pkg/webhook/pod/mutating/extended_resource_spec.go | 2 +- 17 files changed, 23 insertions(+), 24 deletions(-) diff --git a/pkg/descheduler/controllers/migration/evict.go b/pkg/descheduler/controllers/migration/evict.go index 3f5b7ae63..91dca072d 100644 --- a/pkg/descheduler/controllers/migration/evict.go +++ b/pkg/descheduler/controllers/migration/evict.go @@ -83,7 +83,7 @@ func CreatePodMigrationJob(ctx context.Context, pod *corev1.Pod, evictOptions fr err := client.Create(ctx, job) if err != nil { - klog.Errorf("Failed to create PodMigrationJob for Pod %s/s, err: %v", pod.Namespace, pod.Name, err) + klog.Errorf("Failed to create PodMigrationJob for Pod %s/%s, err: %v", pod.Namespace, pod.Name, err) return err } return nil diff --git a/pkg/koordlet/metricsadvisor/collectors/coldmemoryresource/cold_page_kidled.go b/pkg/koordlet/metricsadvisor/collectors/coldmemoryresource/cold_page_kidled.go index 173dba936..a3919e97e 100644 --- a/pkg/koordlet/metricsadvisor/collectors/coldmemoryresource/cold_page_kidled.go +++ b/pkg/koordlet/metricsadvisor/collectors/coldmemoryresource/cold_page_kidled.go @@ -64,12 +64,12 @@ func (k *kidledcoldPageCollector) Enabled() bool { kidledConfig := system.NewDefaultKidledConfig() err := system.SetKidledScanPeriodInSeconds(kidledConfig.ScanPeriodInseconds) if err != nil { - klog.V(4).Infof("cold page collector start kidled err:", err) + klog.V(4).Infof("cold page collector start kidled err: %v", err) return false } err = system.SetKidledUseHierarchy(kidledConfig.UseHierarchy) if err != nil { - klog.V(4).Infof("cold page collector start kidled err:", err) + klog.V(4).Infof("cold page collector start kidled err: %v", err) return false } system.SetIsStartColdMemory(true) diff --git a/pkg/koordlet/qosmanager/framework/pod_qos_control.go b/pkg/koordlet/qosmanager/framework/pod_qos_control.go index a8e682f35..fc2d9059d 100644 --- a/pkg/koordlet/qosmanager/framework/pod_qos_control.go +++ b/pkg/koordlet/qosmanager/framework/pod_qos_control.go @@ -61,7 +61,7 @@ func InjectQOSGreyCtrlPlugins(pod *corev1.Pod, policyType QOSPolicyType, policy klog.Warningf("running qos grey control plugin %v for pod %v failed", name, util.GetPodKey(pod)) } else if pluginInjected { klog.V(5).Infof("running qos grey control plugin %v for pod %v success, policy detail %v", - name, util.GetPodKey(pod)) + name, util.GetPodKey(pod), policy) injected = true } } diff --git a/pkg/koordlet/qosmanager/plugins/cpuevict/cpu_evict.go b/pkg/koordlet/qosmanager/plugins/cpuevict/cpu_evict.go index 23e0898bd..ffe5e5f91 100644 --- a/pkg/koordlet/qosmanager/plugins/cpuevict/cpu_evict.go +++ b/pkg/koordlet/qosmanager/plugins/cpuevict/cpu_evict.go @@ -218,7 +218,7 @@ func (c *cpuEvictor) calculateMilliRelease(thresholdConfig *slov1alpha1.Resource if milliRelease > 0 { klog.V(4).Infof("cpuEvict by ResourceSatisfaction start to evict, milliRelease: %v,"+ "current status (BEUsage:%v, BERequest:%v, BELimit:%v, BERealLimit:%v, BEAllocatable:%v)", - currentBECPUMilliUsage, currentBECPUMilliRequest, currentBECPUMilliLimit, currentBECPUMilliRealLimit, + milliRelease, currentBECPUMilliUsage, currentBECPUMilliRequest, currentBECPUMilliLimit, currentBECPUMilliRealLimit, beCPUMilliAllocatable) } return milliRelease @@ -305,7 +305,7 @@ func (c *cpuEvictor) killAndEvictBEPodsRelease(node *corev1.Node, bePodInfos []* killedPods = append(killedPods, bePod.pod) cpuMilliReleased = cpuMilliReleased + bePod.milliRequest - klog.V(5).Infof("cpuEvict pick pod %s/%s to evict", util.GetPodKey(bePod.pod)) + klog.V(5).Infof("cpuEvict pick pod %s to evict", util.GetPodKey(bePod.pod)) } c.evictor.EvictPodsIfNotEvicted(killedPods, node, resourceexecutor.EvictPodByBECPUSatisfaction, message) diff --git a/pkg/koordlet/qosmanager/plugins/cpusuppress/cpu_suppress.go b/pkg/koordlet/qosmanager/plugins/cpusuppress/cpu_suppress.go index e9046382c..3e6601801 100644 --- a/pkg/koordlet/qosmanager/plugins/cpusuppress/cpu_suppress.go +++ b/pkg/koordlet/qosmanager/plugins/cpusuppress/cpu_suppress.go @@ -453,7 +453,7 @@ func (r *CPUSuppress) recoverCPUSetForBECPUManager() { } resourceStatus, err := apiext.GetResourceStatus(podMeta.Pod.Annotations) if err != nil { - klog.Warningf("get resource status for pod %s failed, error %v", podMeta.Key()) + klog.Warningf("get resource status for pod %s failed, error %v", podMeta.Key(), err.Error()) continue } diff --git a/pkg/koordlet/runtimehooks/hooks/coresched/helper.go b/pkg/koordlet/runtimehooks/hooks/coresched/helper.go index f98e68ec0..ac9616009 100644 --- a/pkg/koordlet/runtimehooks/hooks/coresched/helper.go +++ b/pkg/koordlet/runtimehooks/hooks/coresched/helper.go @@ -126,8 +126,7 @@ func (p *Plugin) addCookie(pids []uint32, groupID string) (uint64, []uint32, err // TODO: refactor to resource updater. func (p *Plugin) assignCookie(pids, siblingPIDs []uint32, groupID string, targetCookieID uint64) ([]uint32, []uint32, error) { if len(pids) <= 0 { - klog.V(6).Infof("aborted to assign PIDs cookie for group %s, target cookie %v, no PID", - targetCookieID, groupID) + klog.V(6).Infof("aborted to assign PIDs cookie for group %v, target cookie %v, no PID", groupID, targetCookieID) return nil, nil, nil } pidsToAssign := NewPIDCache() @@ -225,7 +224,7 @@ func (p *Plugin) clearCookie(pids []uint32, groupID string, lastCookieID uint64) failedPIDs, err := p.cse.Clear(sysutil.CoreSchedScopeThreadGroup, pidsToClear.GetAllSorted()...) if err != nil { - klog.V(4).Infof("failed to clear cookie for group, last cookie %v, PID %v failed of %v, total %v, err: %s", + klog.V(4).Infof("failed to clear cookie for group %v, last cookie %v, PID %v failed of %v, total %v, err: %s", groupID, lastCookieID, len(failedPIDs), pidsToClear.GetAllSorted(), len(pids), err) pidsToClear.DeleteAny(failedPIDs...) } diff --git a/pkg/koordlet/runtimehooks/hooks/groupidentity/rule.go b/pkg/koordlet/runtimehooks/hooks/groupidentity/rule.go index 4f2b1c761..3d25138ce 100644 --- a/pkg/koordlet/runtimehooks/hooks/groupidentity/rule.go +++ b/pkg/koordlet/runtimehooks/hooks/groupidentity/rule.go @@ -212,7 +212,7 @@ func (b *bvtPlugin) ruleUpdateCb(target *statesinformer.CallbackTarget) error { kubeQOSParentDir := koordletutil.GetPodQoSRelativePath(kubeQOS) podCgroupDirs, err := koordletutil.GetCgroupPathsByTargetDepth(sysutil.CPUBVTWarpNsName, kubeQOSParentDir, koordletutil.PodCgroupPathRelativeDepth) if err != nil { - klog.Infof("get pod cgroup paths failed, qos %s, err: %w", kubeQOS, err) + klog.Infof("get pod cgroup paths failed, qos %s, err: %v", kubeQOS, err.Error()) continue } for _, cgroupDir := range podCgroupDirs { diff --git a/pkg/koordlet/runtimehooks/protocol/container_context.go b/pkg/koordlet/runtimehooks/protocol/container_context.go index 7ade6ac45..1d85ab009 100644 --- a/pkg/koordlet/runtimehooks/protocol/container_context.go +++ b/pkg/koordlet/runtimehooks/protocol/container_context.go @@ -92,7 +92,7 @@ func (c *ContainerRequest) FromNri(pod *api.PodSandbox, container *api.Container spec, err := apiext.GetExtendedResourceSpec(pod.GetAnnotations()) if err != nil { - klog.V(4).Infof("failed to get ExtendedResourceSpec from nri via annotation, container %s/%s, err: %s", + klog.V(4).Infof("failed to get ExtendedResourceSpec from nri via annotation, container %s/%s, name: %s, err: %s", c.PodMeta.Namespace, c.PodMeta.Name, c.ContainerMeta.Name, err) } if spec != nil && spec.Containers != nil { @@ -112,7 +112,7 @@ func (c *ContainerRequest) FromProxy(req *runtimeapi.ContainerResourceHookReques // retrieve ExtendedResources from pod annotations spec, err := apiext.GetExtendedResourceSpec(req.GetPodAnnotations()) if err != nil { - klog.V(4).Infof("failed to get ExtendedResourceSpec from proxy via annotation, container %s/%s, err: %s", + klog.V(4).Infof("failed to get ExtendedResourceSpec from proxy via annotation, container %s/%s, name: %s, err: %s", c.PodMeta.Namespace, c.PodMeta.Name, c.ContainerMeta.Name, err) } if spec != nil && spec.Containers != nil { @@ -166,7 +166,7 @@ func (c *ContainerRequest) FromReconciler(podMeta *statesinformer.PodMeta, conta // retrieve ExtendedResources from container spec and pod annotations (prefer container spec) specFromAnnotations, err := apiext.GetExtendedResourceSpec(podMeta.Pod.Annotations) if err != nil { - klog.V(4).Infof("failed to get ExtendedResourceSpec from reconciler via annotation, container %s/%s, err: %s", + klog.V(4).Infof("failed to get ExtendedResourceSpec from reconciler via annotation, container %s/%s, name: %s, err: %s", c.PodMeta.Namespace, c.PodMeta.Name, c.ContainerMeta.Name, err) } if specFromContainer != nil { diff --git a/pkg/koordlet/runtimehooks/rule/rule.go b/pkg/koordlet/runtimehooks/rule/rule.go index de680010d..90a0f0a45 100644 --- a/pkg/koordlet/runtimehooks/rule/rule.go +++ b/pkg/koordlet/runtimehooks/rule/rule.go @@ -65,7 +65,7 @@ func (r *Rule) runUpdateCallbacks(target *statesinformer.CallbackTarget) { for _, callbackFn := range r.callbacks { if err := callbackFn(target); err != nil { cbName := runtime.FuncForPC(reflect.ValueOf(callbackFn).Pointer()).Name() - klog.Warningf("executing %s callback function %s failed, error %v", r.name, cbName) + klog.Warningf("executing %s callback function %s failed, error %v", r.name, cbName, err.Error()) } } } diff --git a/pkg/koordlet/statesinformer/impl/callback_runner.go b/pkg/koordlet/statesinformer/impl/callback_runner.go index 7567002bc..0c30e83bc 100644 --- a/pkg/koordlet/statesinformer/impl/callback_runner.go +++ b/pkg/koordlet/statesinformer/impl/callback_runner.go @@ -117,7 +117,7 @@ func (s *callbackRunner) Start(stopCh <-chan struct{}) { case cbCtx := <-s.callbackChans[cbType]: cbObj := s.getObjByType(cbType, cbCtx) if cbObj == nil { - klog.Warningf("callback runner with type %v is not exist") + klog.Warningf("callback runner with type %T is not exist", cbObj) } else { s.runCallbacks(cbType, cbObj) } diff --git a/pkg/koordlet/statesinformer/impl/states_pods.go b/pkg/koordlet/statesinformer/impl/states_pods.go index 7287ff27e..7da62dbf1 100644 --- a/pkg/koordlet/statesinformer/impl/states_pods.go +++ b/pkg/koordlet/statesinformer/impl/states_pods.go @@ -117,7 +117,7 @@ func (s *podsInformer) Start(stopCh <-chan struct{}) { go s.syncKubeletLoop(s.config.KubeletSyncInterval, stopCh) go func() { if err := s.pleg.Run(stopCh); err != nil { - klog.Fatalf("Unable to run the pleg: ", err) + klog.Fatalf("Unable to run the pleg: %v", err.Error()) } }() diff --git a/pkg/koordlet/util/meminfo.go b/pkg/koordlet/util/meminfo.go index 7bdcd3fb9..1dcdc7bf3 100644 --- a/pkg/koordlet/util/meminfo.go +++ b/pkg/koordlet/util/meminfo.go @@ -176,7 +176,7 @@ func GetHugePagesInfo(nodeDir string) (map[uint64]*HugePagesInfo, error) { hugepageDir := system.GetNUMAHugepagesDir(nodeDir) hugeDirs, err := os.ReadDir(hugepageDir) if err != nil { - klog.Warningf("failed to read hugepage dir %s, err: %w", hugepageDir, err) + klog.Warningf("failed to read hugepage dir %s, err: %v", hugepageDir, err) return hugePagesInfo, err } diff --git a/pkg/koordlet/util/system/config.go b/pkg/koordlet/util/system/config.go index 9dda99659..6ff2bf885 100644 --- a/pkg/koordlet/util/system/config.go +++ b/pkg/koordlet/util/system/config.go @@ -68,7 +68,7 @@ func InitSupportConfigs() { initCgroupsVersion() HostSystemInfo = collectVersionInfo() if isResctrlSupported, err := IsSupportResctrl(); err != nil { - klog.Warningf("failed to check resctrl support status, use %d, err: %v", isResctrlSupported, err) + klog.Warningf("failed to check resctrl support status, use %v, err: %v", isResctrlSupported, err) } else { klog.V(4).Infof("resctrl supported: %v", isResctrlSupported) } diff --git a/pkg/util/httputil/reverseproxy.go b/pkg/util/httputil/reverseproxy.go index 05ab304c9..92e0c08c6 100644 --- a/pkg/util/httputil/reverseproxy.go +++ b/pkg/util/httputil/reverseproxy.go @@ -596,7 +596,7 @@ func (p *ReverseProxy) handleUpgradeResponse(rw http.ResponseWriter, req *http.R conn, brw, err := hj.Hijack() if err != nil { - p.getErrorHandler()(rw, req, fmt.Errorf("Hijack failed on protocol switch: %v", err)) + p.getErrorHandler()(rw, req, fmt.Errorf("hijack failed on protocol switch: %v", err)) return } defer conn.Close() diff --git a/pkg/util/metrics/expire_metric.go b/pkg/util/metrics/expire_metric.go index 53519fffa..17cb8ea61 100644 --- a/pkg/util/metrics/expire_metric.go +++ b/pkg/util/metrics/expire_metric.go @@ -253,7 +253,7 @@ func (e *metricGC) UpdateStatus(metricName string, labels prometheus.Labels) { err := e.updateStatus(time.Now().Unix(), metricName, labels) e.globalLock.RUnlock() if err != nil { - klog.Errorf("failed to update status for metric %s, err: %s", metricName) + klog.Errorf("failed to update status for metric %s, err: %s", metricName, err.Error()) } } @@ -271,7 +271,7 @@ func (e *metricGC) RemoveStatus(metricName string, labels prometheus.Labels) { err := e.removeStatus(metricName, labels) e.globalLock.RUnlock() if err != nil { - klog.Errorf("failed to remove status for metric %s, err: %s", metricName) + klog.Errorf("failed to remove status for metric %s, err: %s", metricName, err.Error()) } } diff --git a/pkg/webhook/api_debug_server.go b/pkg/webhook/api_debug_server.go index 820b6710c..c36e29bec 100644 --- a/pkg/webhook/api_debug_server.go +++ b/pkg/webhook/api_debug_server.go @@ -32,6 +32,6 @@ func RegisterDebugAPIProvider(name string, provider http.Handler) { func InstallDebugAPIHandler(server *webhook.Server) { for name, provider := range debugAPIProviderMap { server.Register(name, provider) - klog.Infof("Success register debug api handler, name:%v, tcpAddr:%v", name) + klog.Infof("Success register debug api handler, name:%v, tcpAddr:%s:%d", name, server.Host, server.Port) } } diff --git a/pkg/webhook/pod/mutating/extended_resource_spec.go b/pkg/webhook/pod/mutating/extended_resource_spec.go index 3a3c072cb..b50e8963e 100644 --- a/pkg/webhook/pod/mutating/extended_resource_spec.go +++ b/pkg/webhook/pod/mutating/extended_resource_spec.go @@ -67,7 +67,7 @@ func (h *PodMutatingHandler) mutateByExtendedResources(pod *corev1.Pod) error { } if reflect.DeepEqual(extendedResourceSpec, spec) { // if resource requirements not changed, just return - klog.V(6).Infof("extended resource spec of pod %s/%s unchanged, skip patch the annotation") + klog.V(6).Infof("extended resource spec of pod %s/%s unchanged, skip patch the annotation", pod.Namespace, pod.Name) return nil }