fix: fixed connection anno

api/core/v1alpha1/store_helper.go

@@ -21,6 +21,9 @@ const (
 	// StoreConnectionAnno expose the connection count of the store
 	StoreConnectionAnno = "matrixorigin.io/connections"
 
+	// StoreScoreAnno expose the score of the store
+	StoreScoreAnno = "matrixorigin.io/score"
+
 	// StoreCordonAnno cordons a CN store
 	StoreCordonAnno = "matrixorigin.io/store-cordon"
 )

pkg/controllers/cnstore/controller.go

@@ -172,7 +172,7 @@ func (c *withCNSet) OnPreparingStop(ctx *recon.Context[*corev1.Pod]) error {
 		return recon.ErrReSync("wait for min delay", retryInterval)
 	}
 
-	storeConnection, err := common.GetStoreConnection(pod)
+	storeConnection, err := common.GetStoreScore(pod)
 	if err != nil {
 		return errors.Wrap(err, "error get store connection count")
 	}
@@ -372,19 +372,22 @@ func (c *withCNSet) syncStats(ctx *recon.Context[*corev1.Pod]) error {
 		}
 	}
 
-	sc := &common.StoreConnection{
+	sc := &common.StoreScore{
 		SessionCount:  count,
 		PipelineCount: pipelineCount,
 	}
 	err = ctx.Patch(pod, func() error {
-		if err := common.SetStoreConnection(pod, sc); err != nil {
+		if err := common.SetStoreScore(pod, sc); err != nil {
 			return err
 		}
 		pod.Annotations[common.DeletionCostAnno] = strconv.Itoa(sc.GenDeletionCost())
 		if pod.Labels == nil {
 			pod.Labels = map[string]string{}
 		}
 		pod.Labels[common.CNUUIDLabelKey] = uid
+		// NB: store-connections anno is no longer used in mo-operator, but must be kept for external compatibility
+		// ref: https://github.com/matrixorigin/MO-Cloud/issues/3007
+		pod.Annotations[v1alpha1.StoreConnectionAnno] = strconv.Itoa(sc.PipelineCount + sc.SessionCount)
 		return nil
 	})
 	if err != nil {
@@ -498,7 +501,7 @@ func (annotationChangedExcludeStats) Update(e event.UpdateEvent) bool {
 	newAnnos := e.ObjectNew.GetAnnotations()
 	for k, v := range newAnnos {
 		// exclude stats
-		if k == common.DeletionCostAnno || k == v1alpha1.StoreConnectionAnno {
+		if k == common.DeletionCostAnno || k == v1alpha1.StoreConnectionAnno || k == v1alpha1.StoreScoreAnno {
 			continue
 		}
 		// only consider newly added annotations or annotation value change, deletion of annotation key

pkg/controllers/cnstore/pooling.go

@@ -63,7 +63,7 @@ func (c *withCNSet) poolingCNReconcile(ctx *recon.Context[*corev1.Pod]) error {
 		if time.Since(parsed) < c.cn.Spec.ScalingConfig.GetMinDelayDuration() {
 			return recon.ErrReSync("wait min delay duration", retryInterval)
 		}
-		storeConnection, err := common.GetStoreConnection(pod)
+		storeConnection, err := common.GetStoreScore(pod)
 		if err != nil {
 			return errors.Wrap(err, "error get store connection count")
 		}

pkg/controllers/common/cnstore.go

@@ -145,26 +145,26 @@ func ToStoreLabels(labels []v1alpha1.CNLabel) map[string]metadata.LabelList {
 	return lm
 }
 
-type StoreConnection struct {
+type StoreScore struct {
 	SessionCount  int `json:"sessionCount"`
 	PipelineCount int `json:"pipelineCount"`
 }
 
-func (s *StoreConnection) GenDeletionCost() int {
+func (s *StoreScore) GenDeletionCost() int {
 	return s.SessionCount
 }
 
-func (s *StoreConnection) IsSafeToReclaim() bool {
+func (s *StoreScore) IsSafeToReclaim() bool {
 	return s.SessionCount == 0 && s.PipelineCount == 0
 }
 
-// GetStoreConnection get the store connection count from Pod anno
-func GetStoreConnection(pod *corev1.Pod) (*StoreConnection, error) {
-	connectionStr, ok := pod.Annotations[v1alpha1.StoreConnectionAnno]
+// GetStoreScore get the store connection count from Pod anno
+func GetStoreScore(pod *corev1.Pod) (*StoreScore, error) {
+	connectionStr, ok := pod.Annotations[v1alpha1.StoreScoreAnno]
 	if !ok {
 		return nil, errors.Errorf("cannot find connection count for CN pod %s/%s, connection annotation is empty", pod.Namespace, pod.Name)
 	}
-	s := &StoreConnection{}
+	s := &StoreScore{}
 	if len(connectionStr) == 0 {
 		return s, nil
 	}
@@ -180,16 +180,16 @@ func GetStoreConnection(pod *corev1.Pod) (*StoreConnection, error) {
 	return s, nil
 }
 
-// SetStoreConnection set the store connection info to Pod anno
-func SetStoreConnection(pod *corev1.Pod, s *StoreConnection) error {
+// SetStoreScore set the store connection info to Pod anno
+func SetStoreScore(pod *corev1.Pod, s *StoreScore) error {
 	b, err := json.Marshal(s)
 	if err != nil {
 		return errors.Wrap(err, "error marshal connection info")
 	}
 	if pod.Annotations == nil {
 		pod.Annotations = map[string]string{}
 	}
-	pod.Annotations[v1alpha1.StoreConnectionAnno] = string(b)
+	pod.Annotations[v1alpha1.StoreScoreAnno] = string(b)
 	return nil
 }