fix:修复查询配置文件分组列表不显示文件数量 (#1231)

polarismesh · Sep 2, 2023 · cf4dd1c · cf4dd1c
1 parent 6c52a06
commit cf4dd1c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/apiserver/xdsserverv3/resource/node.go b/apiserver/xdsserverv3/resource/node.go
@@ -159,9 +159,9 @@ func (x *XDSNodeManager) ListSidecarNodes() []*XDSClient {
 // ID id 的格式是 ${sidecar|gateway}~namespace/uuid~hostIp
 // case 1: envoy 为 sidecar 模式时，则 NodeID 的格式为以下两种
 //
-//	 eg 1. namespace/uuid~hostIp
-//	 eg 2. sidecar~namespace/uuid-hostIp
-//	 eg 3. envoy_node_id="${NAMESPACE}/${INSTANCE_IP}~${POD_NAME}"
+//	eg 1. namespace/uuid~hostIp
+//	eg 2. sidecar~namespace/uuid-hostIp
+//	eg 3. envoy_node_id="${NAMESPACE}/${INSTANCE_IP}~${POD_NAME}"
 //
 // case 2: envoy 为 gateway 模式时，则 NodeID 的格式为： gateway~namespace/uuid~hostIp
 func (PolarisNodeHash) ID(node *core.Node) string {

diff --git a/config/config_file_group.go b/config/config_file_group.go
@@ -25,6 +25,7 @@ import (
 	apiconfig "github.com/polarismesh/specification/source/go/api/v1/config_manage"
 	apimodel "github.com/polarismesh/specification/source/go/api/v1/model"
 	"go.uber.org/zap"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 
 	cachetypes "github.com/polarismesh/polaris/cache/api"
 	api "github.com/polarismesh/polaris/common/api/v1"
@@ -276,7 +277,14 @@ func (s *Server) QueryConfigFileGroups(ctx context.Context,
 	}
 	values := make([]*apiconfig.ConfigFileGroup, 0, len(ret))
 	for i := range ret {
-		values = append(values, model.ToConfigGroupAPI(ret[i]))
+		item := model.ToConfigGroupAPI(ret[i])
+		fileCount, err := s.storage.CountConfigFiles(ret[i].Namespace, ret[i].Name)
+		if err != nil {
+			log.Error("[Config][Service] get config file count for group error.", utils.RequestID(ctx),
+				utils.ZapNamespace(ret[i].Namespace), utils.ZapGroup(ret[i].Name), zap.Error(err))
+		}
+		item.FileCount = wrapperspb.UInt64(fileCount)
+		values = append(values, item)
 	}
 
 	resp := api.NewConfigBatchQueryResponse(apimodel.Code_ExecuteSuccess)

diff --git a/store/mysql/admin.go b/store/mysql/admin.go
@@ -252,7 +252,7 @@ func (le *leaderElectionStateMachine) tick() {
 			log.Errorf("[Store][database] leader heartbeat err (%v), change to follower state (%s)", err, le.electKey)
 		}
 		if !success && err == nil {
-			log.Errorf("[Store][database] leader heartbeat abort, change to follower state (%s)", le.electKey)
+			log.Infof("[Store][database] leader heartbeat abort, change to follower state (%s)", le.electKey)
 		}
 	}
 	leader, dead, err := le.checkLeaderDead()