feat: add GetNodeMetric in statesInformer interface

add func GetNodeMetric, so we can get nodeMetric conveniently by statesInformer interface Signed-off-by: j4ckstraw <[email protected]>
koordinator-sh · Nov 22, 2024 · 4a03d7f · 4a03d7f
1 parent b4c53c8
commit 4a03d7f
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 0 deletions.
diff --git a/pkg/koordlet/prediction/prediction_test.go b/pkg/koordlet/prediction/prediction_test.go
@@ -43,10 +43,15 @@ func (m *mockStatesInformer) HasSynced() bool {
 func (m *mockStatesInformer) GetNode() *v1.Node {
 	return m.node
 }
+
 func (m *mockStatesInformer) GetNodeSLO() *slov1alpha1.NodeSLO {
 	return nil
 }
 
+func (m *mockStatesInformer) GetNodeMetric() *slov1alpha1.NodeMetric {
+	return nil
+}
+
 func (m *mockStatesInformer) GetAllPods() []*statesinformer.PodMeta {
 	return m.pods
 }

diff --git a/pkg/koordlet/statesinformer/api.go b/pkg/koordlet/statesinformer/api.go
@@ -120,6 +120,7 @@ type StatesInformer interface {
 
 	GetNode() *corev1.Node
 	GetNodeSLO() *slov1alpha1.NodeSLO
+	GetNodeMetric() *slov1alpha1.NodeMetric
 
 	GetAllPods() []*PodMeta
 

diff --git a/pkg/koordlet/statesinformer/impl/states_informer.go b/pkg/koordlet/statesinformer/impl/states_informer.go
@@ -51,6 +51,7 @@ type StatesInformer interface {
 
 	GetNode() *corev1.Node
 	GetNodeSLO() *slov1alpha1.NodeSLO
+	GetNodeMetric() *slov1alpha1.NodeMetric
 
 	GetAllPods() []*statesinformer.PodMeta
 
@@ -101,6 +102,8 @@ type informerPlugin interface {
 	HasSynced() bool
 }
 
+var _ StatesInformer = &statesInformer{}
+
 // 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, predictorFactory prediction.PredictorFactory) StatesInformer {
@@ -225,6 +228,16 @@ func (s *statesInformer) GetNodeSLO() *slov1alpha1.NodeSLO {
 	return nodeSLOInformer.GetNodeSLO()
 }
 
+func (s *statesInformer) GetNodeMetric() *slov1alpha1.NodeMetric {
+	nodeMetricInformerIf := s.states.informerPlugins[nodeMetricInformerName]
+	nodeMetricInformer, ok := nodeMetricInformerIf.(*nodeMetricInformer)
+	if !ok {
+		klog.Errorf("node metric informer format error")
+		return nil
+	}
+	return nodeMetricInformer.GetNodeMetric()
+}
+
 func (s *statesInformer) GetNodeTopo() *topov1alpha1.NodeResourceTopology {
 	nodeTopoInformerIf := s.states.informerPlugins[nodeTopoInformerName]
 	nodeTopoInformer, ok := nodeTopoInformerIf.(*nodeTopoInformer)

diff --git a/pkg/koordlet/statesinformer/impl/states_nodemetric.go b/pkg/koordlet/statesinformer/impl/states_nodemetric.go
@@ -109,6 +109,16 @@ func NewNodeMetricInformer() *nodeMetricInformer {
 	return &nodeMetricInformer{}
 }
 
+func (s *nodeMetricInformer) GetNodeMetric() *slov1alpha1.NodeMetric {
+	s.rwMutex.RLock()
+	defer s.rwMutex.RUnlock()
+
+	if s.nodeMetric == nil {
+		return nil
+	}
+	return s.nodeMetric.DeepCopy()
+}
+
 func (r *nodeMetricInformer) HasSynced() bool {
 	if !r.reportEnabled {
 		return true

diff --git a/pkg/koordlet/statesinformer/mockstatesinformer/mock.go b/pkg/koordlet/statesinformer/mockstatesinformer/mock.go