lint

Signed-off-by: Zhang Kang <kang.zhang@intel.com>
koordinator-sh · Jul 3, 2024 · 8235621 · 8235621
1 parent 40f1cf6
commit 8235621
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/pkg/koordlet/runtimehooks/config.go b/pkg/koordlet/runtimehooks/config.go
@@ -18,7 +18,6 @@ package runtimehooks
 
 import (
 	"flag"
-	"github.com/koordinator-sh/koordinator/pkg/koordlet/runtimehooks/hooks/resctrl"
 	"math"
 	"time"
 
@@ -33,6 +32,7 @@ import (
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/runtimehooks/hooks/cpuset"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/runtimehooks/hooks/gpu"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/runtimehooks/hooks/groupidentity"
+	"github.com/koordinator-sh/koordinator/pkg/koordlet/runtimehooks/hooks/resctrl"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/runtimehooks/hooks/terwayqos"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/util/system"
 )

diff --git a/pkg/koordlet/util/resctrl/ctrl_mgr_test.go b/pkg/koordlet/util/resctrl/ctrl_mgr_test.go
@@ -2,16 +2,17 @@ package resctrl
 
 import (
 	"fmt"
-	"github.com/koordinator-sh/koordinator/pkg/koordlet/runtimehooks/protocol"
-	"github.com/koordinator-sh/koordinator/pkg/koordlet/util/system"
-	gocache "github.com/patrickmn/go-cache"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"path/filepath"
 	"reflect"
-	"sync"
 	"testing"
 	"time"
+
+	gocache "github.com/patrickmn/go-cache"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/koordinator-sh/koordinator/pkg/koordlet/runtimehooks/protocol"
+	"github.com/koordinator-sh/koordinator/pkg/koordlet/util/system"
 )
 
 type UpdateFunc func(resource ResctrlUpdater) error
@@ -102,7 +103,6 @@ func TestControlGroupManager_AddPod(t *testing.T) {
 	type fields struct {
 		rdtcgs            *gocache.Cache
 		reconcileInterval int64
-		Mutex             sync.Mutex
 		groupExist        bool
 	}
 	type args struct {
@@ -122,7 +122,6 @@ func TestControlGroupManager_AddPod(t *testing.T) {
 			fields: fields{
 				rdtcgs:            gocache.New(time.Duration(ExpirationTime), CleanupInterval),
 				reconcileInterval: 0,
-				Mutex:             sync.Mutex{},
 				groupExist:        false,
 			},
 			args: args{
@@ -138,7 +137,6 @@ func TestControlGroupManager_AddPod(t *testing.T) {
 			fields: fields{
 				rdtcgs:            gocache.New(time.Duration(ExpirationTime), CleanupInterval),
 				reconcileInterval: 0,
-				Mutex:             sync.Mutex{},
 				groupExist:        true,
 			},
 			args: args{
@@ -154,7 +152,6 @@ func TestControlGroupManager_AddPod(t *testing.T) {
 			fields: fields{
 				rdtcgs:            gocache.New(time.Duration(ExpirationTime), CleanupInterval),
 				reconcileInterval: 0,
-				Mutex:             sync.Mutex{},
 				groupExist:        false,
 			},
 			args: args{
@@ -170,7 +167,6 @@ func TestControlGroupManager_AddPod(t *testing.T) {
 			fields: fields{
 				rdtcgs:            gocache.New(time.Duration(ExpirationTime), CleanupInterval),
 				reconcileInterval: 0,
-				Mutex:             sync.Mutex{},
 				groupExist:        true,
 			},
 			args: args{
@@ -187,7 +183,6 @@ func TestControlGroupManager_AddPod(t *testing.T) {
 			c := &ControlGroupManager{
 				rdtcgs:            tt.fields.rdtcgs,
 				reconcileInterval: tt.fields.reconcileInterval,
-				Mutex:             tt.fields.Mutex,
 			}
 			// prepare ctrl group if group exist
 			if tt.fields.groupExist {
@@ -262,7 +257,6 @@ func TestControlGroupManager_Init(t *testing.T) {
 	type fields struct {
 		rdtcgs            *gocache.Cache
 		reconcileInterval int64
-		Mutex             sync.Mutex
 		schemataData      []string
 		mockSchemata      string
 	}
@@ -275,7 +269,6 @@ func TestControlGroupManager_Init(t *testing.T) {
 			fields: fields{
 				rdtcgs:            gocache.New(time.Duration(ExpirationTime), CleanupInterval),
 				reconcileInterval: 0,
-				Mutex:             sync.Mutex{},
 				schemataData:      []string{"L3:0=f0\nMB:0=100", "L3:0=fc\nMB:0=100"},
 				mockSchemata:      "L3:0=ff\nMB:0=100\n",
 			},
@@ -293,7 +286,6 @@ func TestControlGroupManager_Init(t *testing.T) {
 			c := &ControlGroupManager{
 				rdtcgs:            tt.fields.rdtcgs,
 				reconcileInterval: tt.fields.reconcileInterval,
-				Mutex:             tt.fields.Mutex,
 			}
 			c.Init()
 			p, ok := c.rdtcgs.Get("pod1")
@@ -315,7 +307,6 @@ func TestControlGroupManager_RemovePod(t *testing.T) {
 	type fields struct {
 		rdtcgs            *gocache.Cache
 		reconcileInterval int64
-		Mutex             sync.Mutex
 	}
 	type args struct {
 		podid         string
@@ -333,16 +324,15 @@ func TestControlGroupManager_RemovePod(t *testing.T) {
 			fields: fields{
 				rdtcgs:            gocache.New(time.Duration(ExpirationTime), CleanupInterval),
 				reconcileInterval: 0,
-				Mutex:             sync.Mutex{},
 			},
+			want: true,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := &ControlGroupManager{
 				rdtcgs:            tt.fields.rdtcgs,
 				reconcileInterval: tt.fields.reconcileInterval,
-				Mutex:             tt.fields.Mutex,
 			}
 			if got := c.RemovePod(tt.args.podid, tt.args.fromNRI, tt.args.removeUpdater); got != tt.want {
 				t.Errorf("RemovePod() = %v, want %v", got, tt.want)