Merge pull request #771 from h-w-chen/dev/log-cleanup

chore(*):  log clean up - log level downgraded to 6 for detailed and lengthy lines

Author: luomingmeng

pkg/agent/qrm-plugins/cpu/dynamicpolicy/state/state_mem.go

@@ -104,7 +104,9 @@ func (s *cpuPluginState) SetMachineState(numaNodeMap NUMANodeMap) {
 	defer s.Unlock()
 
 	s.machineState = numaNodeMap.Clone()
-	klog.InfoS("[cpu_plugin] Updated cpu plugin machine state", "numaNodeMap", numaNodeMap.String())
+	if klog.V(6).Enabled() {
+		klog.InfoS("[cpu_plugin] Updated cpu plugin machine state", "numaNodeMap", numaNodeMap.String())
+	}
 }
 
 func (s *cpuPluginState) SetNUMAHeadroom(numaHeadroom map[int]float64) {
@@ -135,8 +137,10 @@ func (s *cpuPluginState) SetPodEntries(podEntries PodEntries) {
 	defer s.Unlock()
 
 	s.podEntries = podEntries.Clone()
-	klog.InfoS("[cpu_plugin] Updated cpu plugin pod entries",
-		"podEntries", podEntries.String())
+	if klog.V(6).Enabled() {
+		klog.InfoS("[cpu_plugin] Updated cpu plugin pod entries",
+			"podEntries", podEntries.String())
+	}
 }
 
 func (s *cpuPluginState) SetAllowSharedCoresOverlapReclaimedCores(allowSharedCoresOverlapReclaimedCores bool) {

pkg/agent/qrm-plugins/cpu/dynamicpolicy/state/state_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package state
 
 import (
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"math"
@@ -28,6 +29,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/klog/v2"
 	pluginapi "k8s.io/kubelet/pkg/apis/resourceplugin/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
 	testutil "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state/testing"
@@ -1507,6 +1509,11 @@ func TestNewCheckpointState(t *testing.T) {
 func TestClearState(t *testing.T) {
 	t.Parallel()
 
+	flagSet := flag.NewFlagSet("test", flag.ExitOnError)
+	klog.InitFlags(flagSet)
+	_ = flagSet.Parse([]string{"--v", "6"})
+	defer klog.InitFlags(nil)
+
 	as := require.New(t)
 
 	testName := "test"

pkg/agent/qrm-plugins/memory/dynamicpolicy/policy_test.go

@@ -18,6 +18,7 @@ package dynamicpolicy
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -2213,6 +2214,11 @@ func TestGenerateResourcesMachineStateFromPodEntries(t *testing.T) {
 func TestHandleAdvisorResp(t *testing.T) {
 	t.Parallel()
 
+	flagSet := flag.NewFlagSet("test", flag.ExitOnError)
+	klog.InitFlags(flagSet)
+	_ = flagSet.Parse([]string{"--v", "6"})
+	defer klog.InitFlags(nil)
+
 	as := require.New(t)
 	cpuTopology, err := machine.GenerateDummyCPUTopology(16, 2, 4)
 	as.Nil(err)

pkg/agent/qrm-plugins/memory/dynamicpolicy/state/state_mem.go

@@ -127,8 +127,10 @@ func (s *memoryPluginState) SetMachineState(numaNodeResourcesMap NUMANodeResourc
 	defer s.Unlock()
 
 	s.machineState = numaNodeResourcesMap.Clone()
-	klog.InfoS("[memory_plugin] Updated memory plugin machine state",
-		"numaNodeResourcesMap", numaNodeResourcesMap.String())
+	if klog.V(6).Enabled() {
+		klog.InfoS("[memory_plugin] Updated memory plugin machine state",
+			"numaNodeResourcesMap", numaNodeResourcesMap.String())
+	}
 }
 
 func (s *memoryPluginState) SetNUMAHeadroom(numaHeadroom map[int]int64) {
@@ -164,8 +166,10 @@ func (s *memoryPluginState) SetPodResourceEntries(podResourceEntries PodResource
 	defer s.Unlock()
 
 	s.podResourceEntries = podResourceEntries.Clone()
-	klog.InfoS("[memory_plugin] Updated memory plugin pod resource entries",
-		"podResourceEntries", podResourceEntries.String())
+	if klog.V(6).Enabled() {
+		klog.InfoS("[memory_plugin] Updated memory plugin pod resource entries",
+			"podResourceEntries", podResourceEntries.String())
+	}
 }
 
 func (s *memoryPluginState) Delete(resourceName v1.ResourceName, podUID, containerName string) {

pkg/agent/resourcemanager/reporter/cnr/cnrreporter.go

@@ -353,7 +353,10 @@ func (c *cnrReporterImpl) tryUpdateCNRStatus(ctx context.Context,
 				"status": "success",
 			})...)
 
-		klog.Infof("patch cnr status success old status: %#v,\n new status: %#v", originCNR.Status, cnr.Status)
+		if klog.V(6).Enabled() {
+			klog.Infof("patch cnr status success old status: %#v,\n new status: %#v", originCNR.Status, cnr.Status)
+		}
+
 		c.latestUpdatedCNR = cnr.DeepCopy()
 
 		// notify cnr status update

pkg/agent/resourcemanager/reporter/cnr/cnrreporter_test.go

@@ -19,6 +19,7 @@ package cnr
 import (
 	"context"
 	"encoding/json"
+	"flag"
 	"testing"
 	"time"
 
@@ -29,6 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/klog/v2"
 
 	nodev1alpha1 "github.com/kubewharf/katalyst-api/pkg/apis/node/v1alpha1"
 	apiconsts "github.com/kubewharf/katalyst-api/pkg/consts"
@@ -521,6 +523,11 @@ func Test_initializeCNRFields(t *testing.T) {
 func Test_cnrReporterImpl_Update(t *testing.T) {
 	t.Parallel()
 
+	flagSet := flag.NewFlagSet("test", flag.ExitOnError)
+	klog.InitFlags(flagSet)
+	_ = flagSet.Parse([]string{"--v", "6"})
+	defer klog.InitFlags(nil)
+
 	type fields struct {
 		defaultCNR *nodev1alpha1.CustomNodeResource
 	}

pkg/agent/sysadvisor/plugin/qosaware/resource/cpu/advisor.go

@@ -267,7 +267,9 @@ func (cra *cpuResourceAdvisor) updateWithIsolationGuardian(tryIsolation bool) (
 
 	cra.advisorUpdated = true
 
-	klog.Infof("[qosaware-cpu] region map: %v", general.ToString(cra.regionMap))
+	if klog.V(6).Enabled() {
+		klog.Infof("[qosaware-cpu] region map: %v", general.ToString(cra.regionMap))
+	}
 
 	// assemble provision result from each region
 	calculationResult, err := cra.assembleProvision()

pkg/agent/sysadvisor/plugin/qosaware/resource/cpu/advisor_test.go

@@ -18,6 +18,7 @@ package cpu
 
 import (
 	"context"
+	"flag"
 	"io/ioutil"
 	"os"
 	"reflect"
@@ -32,6 +33,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
 	"k8s.io/kubelet/pkg/apis/resourceplugin/v1alpha1"
 
 	configapi "github.com/kubewharf/katalyst-api/pkg/apis/config/v1alpha1"
@@ -134,6 +136,11 @@ func makeContainerInfo(podUID, namespace, podName, containerName, qoSLevel, owne
 func TestAdvisorUpdate(t *testing.T) {
 	t.Parallel()
 
+	flagSet := flag.NewFlagSet("test", flag.ExitOnError)
+	klog.InitFlags(flagSet)
+	_ = flagSet.Parse([]string{"--v", "6"})
+	defer klog.InitFlags(nil)
+
 	type containerMetricItem struct {
 		pod       string
 		container string

pkg/agent/sysadvisor/plugin/qosaware/server/cpu_server.go

@@ -180,7 +180,11 @@ func (cs *cpuServer) getAndSyncCheckpoint(ctx context.Context, client cpuadvisor
 		_ = cs.emitter.StoreInt64(cs.genMetricsName(metricServerLWGetCheckpointFailed), int64(cs.period.Seconds()), metrics.MetricTypeNameCount)
 		return fmt.Errorf("got nil checkpoint")
 	}
-	klog.Infof("[qosaware-server-cpu] got checkpoint: %v", general.ToString(getCheckpointResp.Entries))
+
+	if klog.V(6).Enabled() {
+		klog.Infof("[qosaware-server-cpu] got checkpoint: %v", general.ToString(getCheckpointResp.Entries))
+	}
+
 	_ = cs.emitter.StoreInt64(cs.genMetricsName(metricServerLWGetCheckpointSucceeded), int64(cs.period.Seconds()), metrics.MetricTypeNameCount)
 
 	cs.syncCheckpoint(ctx, getCheckpointResp, safeTime)
@@ -230,7 +234,11 @@ func (cs *cpuServer) getAndPushAdvice(client cpuadvisor.CPUPluginClient, server
 		_ = cs.emitter.StoreInt64(cs.genMetricsName(metricServerLWSendResponseFailed), int64(cs.period.Seconds()), metrics.MetricTypeNameCount)
 		return fmt.Errorf("send listWatch response failed: %w", err)
 	}
-	klog.Infof("[qosaware-server-cpu] sent listWatch resp: %v", general.ToString(lwResp))
+
+	if klog.V(6).Enabled() {
+		klog.Infof("[qosaware-server-cpu] sent listWatch resp: %v", general.ToString(lwResp))
+	}
+
 	_ = cs.emitter.StoreInt64(cs.genMetricsName(metricServerLWSendResponseSucceeded), int64(cs.period.Seconds()), metrics.MetricTypeNameCount)
 	return nil
 }

pkg/agent/sysadvisor/plugin/qosaware/server/cpu_server_test.go

@@ -19,6 +19,7 @@ package server
 import (
 	"context"
 	"encoding/json"
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -37,6 +38,7 @@ import (
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/klog/v2"
 
 	"github.com/kubewharf/katalyst-api/pkg/consts"
 	"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options"
@@ -354,6 +356,11 @@ type ContainerInfo struct {
 func TestCPUServerUpdate(t *testing.T) {
 	t.Parallel()
 
+	flagSet := flag.NewFlagSet("test", flag.ExitOnError)
+	klog.InitFlags(flagSet)
+	_ = flagSet.Parse([]string{"--v", "6"})
+	defer klog.InitFlags(nil)
+
 	type testCase struct {
 		name      string
 		provision types.InternalCPUCalculationResult

pkg/agent/sysadvisor/plugin/qosaware/server/memory_server.go

@@ -258,7 +258,11 @@ func (ms *memoryServer) getAndPushAdvice(server advisorsvc.AdvisorService_ListAn
 		_ = ms.emitter.StoreInt64(ms.genMetricsName(metricServerLWSendResponseFailed), int64(ms.period.Seconds()), metrics.MetricTypeNameCount)
 		return fmt.Errorf("send listWatch response failed: %w", err)
 	}
-	klog.Infof("[qosaware-server-memory] sent listWatch resp: %v", general.ToString(lwResp))
+
+	if klog.V(6).Enabled() {
+		klog.Infof("[qosaware-server-memory] sent listWatch resp: %v", general.ToString(lwResp))
+	}
+
 	_ = ms.emitter.StoreInt64(ms.genMetricsName(metricServerLWSendResponseSucceeded), int64(ms.period.Seconds()), metrics.MetricTypeNameCount)
 	return nil
 }