[COMTROLLER/RECORDER] optimizes message metadata

deepflowio · May 29, 2024 · 48f8bc5 · 48f8bc5
1 parent 61ac007
commit 48f8bc5
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 14 deletions.
diff --git a/server/controller/db/mysql/common/const.go b/server/controller/db/mysql/common/const.go
@@ -17,8 +17,8 @@
 package common
 
 const (
-	NONE_DEFAULT_ORG_DATABASE_SUFFIX = "_deepflow"
-	DATABASE_PREFIX_ALIGNMENT        = "%04d"
+	NON_DEFAULT_ORG_DATABASE_SUFFIX = "_deepflow"
+	DATABASE_PREFIX_ALIGNMENT       = "%04d"
 )
 
 const (

diff --git a/server/controller/db/mysql/common/org.go b/server/controller/db/mysql/common/org.go
@@ -28,7 +28,7 @@ var log = logging.MustGetLogger("db.mysql.common")
 
 // ORGIDToDatabaseName convert organization id to database name, format: 0002_deepflow
 func ORGIDToDatabaseName(id int) string {
-	return fmt.Sprintf(DATABASE_PREFIX_ALIGNMENT, id) + NONE_DEFAULT_ORG_DATABASE_SUFFIX
+	return fmt.Sprintf(DATABASE_PREFIX_ALIGNMENT, id) + NON_DEFAULT_ORG_DATABASE_SUFFIX
 }
 
 func ReplaceConfigDatabaseName(cfg config.MySqlConfig, orgID int) config.MySqlConfig {

diff --git a/server/controller/db/mysql/migrator/common/migrator.go b/server/controller/db/mysql/migrator/common/migrator.go
@@ -100,7 +100,7 @@ func InitCETables(dc *DBConfig) error {
 	}
 
 	// 通过判断数据库名称后缀，判断数据库是否是 default 组织。
-	if !strings.HasSuffix(dc.Config.Database, common.NONE_DEFAULT_ORG_DATABASE_SUFFIX) {
+	if !strings.HasSuffix(dc.Config.Database, common.NON_DEFAULT_ORG_DATABASE_SUFFIX) {
 		if err := initCEDefaultORGTables(dc); err != nil {
 			return err
 		}

diff --git a/server/controller/http/service/resource/domain.go b/server/controller/http/service/resource/domain.go
@@ -649,7 +649,7 @@ func deleteDomain(domain *mysql.Domain, db *mysql.DB, userInfo *svc.UserInfo, cf
 	db.Delete(&domain)
 
 	// pub to tagrecorder
-	metadata := message.NewMetadata(db.ORGID, domain.TeamID, domain.ID, 0)
+	metadata := message.NewMetadata(db.ORGID, domain.TeamID, domain.ID)
 	for _, s := range tagrecorder.GetSubscriberManager().GetSubscribers("domain") {
 		s.OnDomainDeleted(metadata)
 	}

diff --git a/server/controller/recorder/cleaner.go b/server/controller/recorder/cleaner.go
@@ -496,15 +496,15 @@ func (t *toolData) load(db *mysql.DB) error {
 	domainLcuuidToID := make(map[string]int)
 	for _, domain := range domains {
 		domainLcuuidToID[domain.Lcuuid] = domain.ID
-		t.domainLcuuidToMsgMetadata[domain.Lcuuid] = message.NewMetadata(db.ORGID, domain.TeamID, domain.ID, 0)
+		t.domainLcuuidToMsgMetadata[domain.Lcuuid] = message.NewMetadata(db.ORGID, domain.TeamID, domain.ID)
 	}
 	var subDomains []*mysql.SubDomain
 	if err := db.Find(&subDomains).Error; err != nil {
 		log.Error(db.Logf("failed to get sub_domain: %s", err.Error()))
 		return err
 	}
 	for _, subDomain := range subDomains {
-		t.subDomainLcuuidToMsgMetadata[subDomain.Lcuuid] = message.NewMetadata(db.ORGID, subDomain.TeamID, domainLcuuidToID[subDomain.Domain], subDomain.ID)
+		t.subDomainLcuuidToMsgMetadata[subDomain.Lcuuid] = message.NewMetadata(db.ORGID, subDomain.TeamID, domainLcuuidToID[subDomain.Domain], message.MetadataSubDomainID(subDomain.ID))
 	}
 	return nil
 }
diff --git a/server/controller/recorder/pubsub/message/metadata.go b/server/controller/recorder/pubsub/message/metadata.go
@@ -23,11 +23,20 @@ type Metadata struct {
 	SubDomainID int
 }
 
-func NewMetadata(orgID, teamID, domainID, subDomainID int) *Metadata {
-	return &Metadata{
-		ORGID:       orgID,
-		TeamID:      teamID,
-		DomainID:    domainID,
-		SubDomainID: subDomainID,
+func NewMetadata(orgID, teamID, domainID int, options ...func(*Metadata)) *Metadata {
+	md := &Metadata{
+		ORGID:    orgID,
+		TeamID:   teamID,
+		DomainID: domainID,
+	}
+	for _, option := range options {
+		option(md)
+	}
+	return md
+}
+
+func MetadataSubDomainID(id int) func(*Metadata) {
+	return func(m *Metadata) {
+		m.SubDomainID = id
 	}
 }
diff --git a/server/controller/recorder/updater/updater.go b/server/controller/recorder/updater/updater.go
@@ -112,7 +112,8 @@ func newUpdaterBase[
 		diffBaseData: diffBaseData,
 		cloudData:    cloudData,
 	}
-	u.msgMetadata = message.NewMetadata(u.metadata.GetORGID(), u.metadata.Domain.TeamID, u.metadata.Domain.ID, u.metadata.SubDomain.ID)
+	u.msgMetadata = message.NewMetadata(u.metadata.GetORGID(), u.metadata.Domain.TeamID, u.metadata.Domain.ID, message.MetadataSubDomainID(u.metadata.SubDomain.ID))
+
 	log.Infof(u.metadata.Logf("new updater for resource type: %s, message metadata: %#v", resourceType, u.msgMetadata)) // TODO debug
 	u.initPubSub()
 	return u