koordinator-sh · koordinator-bot · Apr 27, 2023 · Apr 27, 2023
diff --git a/hack/mock-gen.sh b/hack/mock-gen.sh
@@ -25,6 +25,7 @@ cd $GOPATH/src/github.com/koordinator-sh/koordinator
 # generates gomock files
 mockgen -source pkg/koordlet/statesinformer/states_informer.go \
   -destination pkg/koordlet/statesinformer/mockstatesinformer/mock.go \
+  -aux_files github.com/koordinator-sh/koordinator/pkg/koordlet/statesinformer=pkg/koordlet/statesinformer/states_informer.go \
   -copyright_file ${LICENSE_HEADER_PATH}
 mockgen -source pkg/koordlet/metriccache/metric_cache.go \
   -destination pkg/koordlet/metriccache/mockmetriccache/mock.go \

diff --git a/pkg/koordlet/metriccache/mockmetriccache/mock.go b/pkg/koordlet/metriccache/mockmetriccache/mock.go
diff --git a/pkg/koordlet/statesinformer/callback_runner_test.go b/pkg/koordlet/statesinformer/callback_runner_test.go
@@ -74,8 +74,8 @@ func TestRegisterCallbacksAndRun(t *testing.T) {
 					RegisterTypeNodeTopology: {},
 				},
 				statesInformer: &statesInformer{
-					states: &pluginState{
-						informerPlugins: map[pluginName]informerPlugin{
+					states: &PluginState{
+						informerPlugins: map[PluginName]informerPlugin{
 							nodeSLOInformerName: &nodeSLOInformer{
 								nodeSLO: &slov1alpha1.NodeSLO{},
 							},
@@ -142,9 +142,9 @@ func Test_statesInformer_startCallbackRunners(t *testing.T) {
 				},
 			}
 			si := &statesInformer{
-				states: &pluginState{
+				states: &PluginState{
 					callbackRunner: cr,
-					informerPlugins: map[pluginName]informerPlugin{
+					informerPlugins: map[PluginName]informerPlugin{
 						nodeSLOInformerName: &nodeSLOInformer{
 							nodeSLO: tt.args.nodeSLO,
 						},

diff --git a/pkg/koordlet/statesinformer/mockstatesinformer/mock.go b/pkg/koordlet/statesinformer/mockstatesinformer/mock.go
diff --git a/pkg/koordlet/statesinformer/registry.go b/pkg/koordlet/statesinformer/registry.go
@@ -18,7 +18,7 @@ package statesinformer
 
 // NOTE: variables in this file can be overwritten for extension
 
-var DefaultPluginRegistry = map[pluginName]informerPlugin{
+var DefaultPluginRegistry = map[PluginName]informerPlugin{
 	nodeSLOInformerName:    NewNodeSLOInformer(),
 	pvcInformerName:        NewPVCInformer(),
 	nodeTopoInformerName:   NewNodeTopoInformer(),

diff --git a/pkg/koordlet/statesinformer/states_device_linux_test.go b/pkg/koordlet/statesinformer/states_device_linux_test.go
@@ -67,8 +67,8 @@ func Test_reportGPUDevice(t *testing.T) {
 	r := &statesInformer{
 		deviceClient: fakeClient,
 		metricsCache: mockMetricCache,
-		states: &pluginState{
-			informerPlugins: map[pluginName]informerPlugin{
+		states: &PluginState{
+			informerPlugins: map[PluginName]informerPlugin{
 				nodeInformerName: &nodeInformer{
 					node: testNode,
 				},

diff --git a/pkg/koordlet/statesinformer/states_informer.go b/pkg/koordlet/statesinformer/states_informer.go
@@ -59,20 +59,20 @@ type StatesInformer interface {
 	RegisterCallbacks(objType RegisterType, name, description string, callbackFn UpdateCbFn)
 }
 
-type pluginName string
+type PluginName string
 
-type pluginOption struct {
+type PluginOption struct {
 	config      *Config
 	KubeClient  clientset.Interface
 	KoordClient koordclientset.Interface
 	TopoClient  topologyclientset.Interface
 	NodeName    string
 }
 
-type pluginState struct {
+type PluginState struct {
 	metricCache     metriccache.MetricCache
 	callbackRunner  *callbackRunner
-	informerPlugins map[pluginName]informerPlugin
+	informerPlugins map[PluginName]informerPlugin
 }
 
 type GetGPUDriverAndModelFunc func() (string, string)
@@ -85,31 +85,31 @@ type statesInformer struct {
 	unhealthyGPU map[string]struct{}
 	gpuMutex     sync.RWMutex
 
-	option  *pluginOption
-	states  *pluginState
+	option  *PluginOption
+	states  *PluginState
 	started *atomic.Bool
 
 	getGPUDriverAndModelFunc GetGPUDriverAndModelFunc
 }
 
 type informerPlugin interface {
-	Setup(ctx *pluginOption, state *pluginState)
+	Setup(ctx *PluginOption, state *PluginState)
 	Start(stopCh <-chan struct{})
 	HasSynced() bool
 }
 
 // TODO merge all clients into one struct
 func NewStatesInformer(config *Config, kubeClient clientset.Interface, crdClient koordclientset.Interface, topologyClient topologyclientset.Interface, metricsCache metriccache.MetricCache, nodeName string, schedulingClient schedv1alpha1.SchedulingV1alpha1Interface) StatesInformer {
-	opt := &pluginOption{
+	opt := &PluginOption{
 		config:      config,
 		KubeClient:  kubeClient,
 		KoordClient: crdClient,
 		TopoClient:  topologyClient,
 		NodeName:    nodeName,
 	}
-	stat := &pluginState{
+	stat := &PluginState{
 		metricCache:     metricsCache,
-		informerPlugins: map[pluginName]informerPlugin{},
+		informerPlugins: map[PluginName]informerPlugin{},
 		callbackRunner:  NewCallbackRunner(),
 	}
 	s := &statesInformer{

diff --git a/pkg/koordlet/statesinformer/states_informer_test.go b/pkg/koordlet/statesinformer/states_informer_test.go
@@ -70,8 +70,8 @@ func Test_statesInformer_GetNode(t *testing.T) {
 				node: tt.fields.node,
 			}
 			s := &statesInformer{
-				states: &pluginState{
-					informerPlugins: map[pluginName]informerPlugin{
+				states: &PluginState{
+					informerPlugins: map[PluginName]informerPlugin{
 						nodeInformerName: nodeInformer,
 					},
 				},
@@ -116,8 +116,8 @@ func Test_statesInformer_GetNodeSLO(t *testing.T) {
 				nodeSLO: tt.fields.nodeSLO,
 			}
 			s := &statesInformer{
-				states: &pluginState{
-					informerPlugins: map[pluginName]informerPlugin{
+				states: &PluginState{
+					informerPlugins: map[PluginName]informerPlugin{
 						nodeSLOInformerName: nodeSLOInformer,
 					},
 				},
@@ -162,8 +162,8 @@ func Test_statesInformer_GetNodeTopo(t *testing.T) {
 				nodeTopology: tt.fields.nodeTopo,
 			}
 			s := &statesInformer{
-				states: &pluginState{
-					informerPlugins: map[pluginName]informerPlugin{
+				states: &PluginState{
+					informerPlugins: map[PluginName]informerPlugin{
 						nodeTopoInformerName: nodeTopoInformer,
 					},
 				},
@@ -218,8 +218,8 @@ func Test_statesInformer_GetAllPods(t *testing.T) {
 				podMap: tt.fields.podMap,
 			}
 			s := &statesInformer{
-				states: &pluginState{
-					informerPlugins: map[pluginName]informerPlugin{
+				states: &PluginState{
+					informerPlugins: map[PluginName]informerPlugin{
 						podsInformerName: podsInformer,
 					},
 				},
@@ -235,7 +235,7 @@ func Test_statesInformer_Run(t *testing.T) {
 	type fields struct {
 		config         *Config
 		node           corev1.Node
-		pluginRegistry map[pluginName]informerPlugin
+		pluginRegistry map[PluginName]informerPlugin
 	}
 	tests := []struct {
 		name    string
@@ -259,7 +259,7 @@ func Test_statesInformer_Run(t *testing.T) {
 						},
 					},
 				},
-				pluginRegistry: map[pluginName]informerPlugin{
+				pluginRegistry: map[PluginName]informerPlugin{
 					nodeSLOInformerName: NewNodeSLOInformer(),
 					nodeInformerName:    NewNodeInformer(),
 				},

diff --git a/pkg/koordlet/statesinformer/states_node.go b/pkg/koordlet/statesinformer/states_node.go
@@ -37,7 +37,7 @@ import (
 )
 
 const (
-	nodeInformerName pluginName = "nodeInformer"
+	nodeInformerName PluginName = "nodeInformer"
 )
 
 type nodeInformer struct {
@@ -59,7 +59,7 @@ func (s *nodeInformer) GetNode() *corev1.Node {
 	return s.node.DeepCopy()
 }
 
-func (s *nodeInformer) Setup(ctx *pluginOption, state *pluginState) {
+func (s *nodeInformer) Setup(ctx *PluginOption, state *PluginState) {
 	s.nodeInformer = newNodeInformer(ctx.KubeClient, ctx.NodeName)
 	s.nodeInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: func(obj interface{}) {

diff --git a/pkg/koordlet/statesinformer/states_nodemetric.go b/pkg/koordlet/statesinformer/states_nodemetric.go
@@ -50,7 +50,7 @@ import (
 )
 
 const (
-	nodeMetricInformerName pluginName = "nodeMetricInformer"
+	nodeMetricInformerName PluginName = "nodeMetricInformer"
 
 	// defaultAggregateDurationSeconds is the default metric aggregate duration by seconds
 	minAggregateDurationSeconds     = 60
@@ -113,7 +113,7 @@ func (r *nodeMetricInformer) HasSynced() bool {
 	return synced
 }
 
-func (r *nodeMetricInformer) Setup(ctx *pluginOption, state *pluginState) {
+func (r *nodeMetricInformer) Setup(ctx *PluginOption, state *PluginState) {
 	r.reportEnabled = ctx.config.EnableNodeMetricReport
 	r.nodeName = ctx.NodeName
 	r.nodeMetricInformer = newNodeMetricInformer(ctx.KoordClient, ctx.NodeName)

diff --git a/pkg/koordlet/statesinformer/states_nodemetric_test.go b/pkg/koordlet/statesinformer/states_nodemetric_test.go
@@ -749,8 +749,8 @@ func Test_nodeMetricInformer_NewAndSetup(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	type args struct {
-		ctx   *pluginOption
-		state *pluginState
+		ctx   *PluginOption
+		state *PluginState
 	}
 	tests := []struct {
 		name string
@@ -759,16 +759,16 @@ func Test_nodeMetricInformer_NewAndSetup(t *testing.T) {
 		{
 			name: "new and setup node metric",
 			args: args{
-				ctx: &pluginOption{
+				ctx: &PluginOption{
 					config:      NewDefaultConfig(),
 					KubeClient:  fakeclientset.NewSimpleClientset(),
 					KoordClient: fakekoordclientset.NewSimpleClientset(),
 					TopoClient:  faketopologyclientset.NewSimpleClientset(),
 					NodeName:    "test-node",
 				},
-				state: &pluginState{
+				state: &PluginState{
 					metricCache: mockmetriccache.NewMockMetricCache(ctrl),
-					informerPlugins: map[pluginName]informerPlugin{
+					informerPlugins: map[PluginName]informerPlugin{
 						podsInformerName: NewPodsInformer(),
 					},
 				},

diff --git a/pkg/koordlet/statesinformer/states_noderesourcetopology.go b/pkg/koordlet/statesinformer/states_noderesourcetopology.go
@@ -53,7 +53,7 @@ import (
 )
 
 const (
-	nodeTopoInformerName pluginName = "nodeTopoInformer"
+	nodeTopoInformerName PluginName = "nodeTopoInformer"
 )
 
 type nodeTopoInformer struct {
@@ -83,7 +83,7 @@ func (s *nodeTopoInformer) GetNodeTopo() *topov1alpha1.NodeResourceTopology {
 	return s.nodeTopology.DeepCopy()
 }
 
-func (s *nodeTopoInformer) Setup(ctx *pluginOption, state *pluginState) {
+func (s *nodeTopoInformer) Setup(ctx *PluginOption, state *PluginState) {
 	s.config = ctx.config
 	s.topologyClient = ctx.TopoClient
 	s.metricCache = state.metricCache