Skip to content

V66 dm #10805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: v6.6
Choose a base branch
from
Draft

V66 dm #10805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bac858f
feat: add dm rawsql
ZhengYa-0110 Nov 2, 2025
1be4fdb
feat: replace char with varchar in dm
ZhengYa-0110 Nov 4, 2025
8163002
feat: add double quotation to the key word domain in dm
ZhengYa-0110 Nov 7, 2025
1253133
feat: support dm db connection
ZhengYa-0110 Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions server/controller/cloud/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ func (c *Cloud) runKubernetesGatherTask() {
oldSubDomains.Add(lcuuid)
}

c.db.DB.Where("domain = ?", c.basicInfo.Lcuuid).Find(&subDomains)
c.db.DB.Where("\"domain\" = ?", c.basicInfo.Lcuuid).Find(&subDomains)
lcuuidToSubDomain := make(map[string]*mysqlmodel.SubDomain)
for index, subDomain := range subDomains {
lcuuidToSubDomain[subDomain.Lcuuid] = &subDomains[index]
Expand Down Expand Up @@ -589,9 +589,9 @@ func (c *Cloud) appendAddtionalResourcesData(resource model.Resource) model.Reso
// new centent field: compressed_content
func getContentFromAdditionalResource(domainUUID string, db *gorm.DB) (*mysqlmodel.DomainAdditionalResource, error) {
var dbItem mysqlmodel.DomainAdditionalResource
result := db.Select("content").Where("domain = ? and content!=''", domainUUID).First(&dbItem)
result := db.Select("content").Where("\"domain\" = ? and content!=''", domainUUID).First(&dbItem)
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
result = db.Select("compressed_content").Where("domain = ?", domainUUID).First(&dbItem)
result = db.Select("compressed_content").Where("\"domain\" = ?", domainUUID).First(&dbItem)
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return nil, nil
}
Expand Down
16 changes: 8 additions & 8 deletions server/controller/cloud/common/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ func GetNodeHostNameByDomain(lcuuid string, isSubDomain bool, db *gorm.DB) (map[
}

var azs []mysqlmodel.AZ
err := db.Where("domain = ?", domain).Find(&azs).Error
err := db.Where("\"domain\" = ?", domain).Find(&azs).Error
if err != nil {
return map[string]string{}, err
}
Expand All @@ -633,12 +633,12 @@ func GetNodeHostNameByDomain(lcuuid string, isSubDomain bool, db *gorm.DB) (map[
}
var podNodes []mysqlmodel.PodNode
if isSubDomain {
err = db.Where("domain = ? AND sub_domain = ?", domain, lcuuid).Find(&podNodes).Error
err = db.Where("\"domain\" = ? AND sub_domain = ?", domain, lcuuid).Find(&podNodes).Error
if err != nil {
return map[string]string{}, err
}
} else {
err = db.Where("domain = ?", domain).Find(&podNodes).Error
err = db.Where("\"domain\" = ?", domain).Find(&podNodes).Error
if err != nil {
return map[string]string{}, err
}
Expand Down Expand Up @@ -666,7 +666,7 @@ func GetHostAndVmHostNameByDomain(domain string, db *gorm.DB) (map[string]string
vmLcuuidToHostName := map[string]string{}

var azs []mysqlmodel.AZ
err := db.Where("domain = ?", domain).Find(&azs).Error
err := db.Where("\"domain\" = ?", domain).Find(&azs).Error
if err != nil {
return map[string]string{}, map[string]string{}, err
}
Expand All @@ -680,7 +680,7 @@ func GetHostAndVmHostNameByDomain(domain string, db *gorm.DB) (map[string]string
return map[string]string{}, map[string]string{}, err
}
var podNodes []mysqlmodel.PodNode
err = db.Where("domain = ?", domain).Find(&podNodes).Error
err = db.Where("\"domain\" = ?", domain).Find(&podNodes).Error
if err != nil {
return map[string]string{}, map[string]string{}, err
}
Expand All @@ -704,7 +704,7 @@ func GetVTapSubDomainMappingByDomain(domain string, db *gorm.DB) (map[int]string
vtapIDToSubDomain := make(map[int]string)

var azs []mysqlmodel.AZ
err := db.Where("domain = ?", domain).Find(&azs).Error
err := db.Where("\"domain\" = ?", domain).Find(&azs).Error
if err != nil {
return vtapIDToSubDomain, err
}
Expand All @@ -714,7 +714,7 @@ func GetVTapSubDomainMappingByDomain(domain string, db *gorm.DB) (map[int]string
}

var podNodes []mysqlmodel.PodNode
err = db.Where("domain = ?", domain).Find(&podNodes).Error
err = db.Where("\"domain\" = ?", domain).Find(&podNodes).Error
if err != nil {
return vtapIDToSubDomain, err
}
Expand All @@ -724,7 +724,7 @@ func GetVTapSubDomainMappingByDomain(domain string, db *gorm.DB) (map[int]string
}

var pods []mysqlmodel.Pod
err = db.Where("domain = ?", domain).Find(&pods).Error
err = db.Where("\"domain\" = ?", domain).Find(&pods).Error
if err != nil {
return vtapIDToSubDomain, err
}
Expand Down
14 changes: 7 additions & 7 deletions server/controller/cloud/sub_domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (c *Cloud) generateSubDomainResource(lcuuid string, kubernetesGatherResourc
func (c *Cloud) getOwnDomainResource() model.Resource {
oResource := model.Resource{}
var vpcs []mysqlmodel.VPC
err := c.db.DB.Where("domain = ?", c.basicInfo.Lcuuid).Find(&vpcs).Error
err := c.db.DB.Where("\"domain\" = ?", c.basicInfo.Lcuuid).Find(&vpcs).Error
if err != nil {
log.Errorf("get own domain resource vpc failed: (%s)", err.Error(), logger.NewORGPrefix(c.orgID))
return oResource
Expand All @@ -191,42 +191,42 @@ func (c *Cloud) getOwnDomainResource() model.Resource {
}

var vms []mysqlmodel.VM
err = c.db.DB.Where("domain = ?", c.basicInfo.Lcuuid).Find(&vms).Error
err = c.db.DB.Where("\"domain\" = ?", c.basicInfo.Lcuuid).Find(&vms).Error
if err != nil {
log.Errorf("get own domain resource vm failed: (%s)", err.Error(), logger.NewORGPrefix(c.orgID))
return oResource
}

var vinterfaces []mysqlmodel.VInterface
err = c.db.DB.Select("id", "lcuuid", "iftype", "mac", "devicetype", "deviceid", "region").Where("domain = ?", c.basicInfo.Lcuuid).Find(&vinterfaces).Error
err = c.db.DB.Select("id", "lcuuid", "iftype", "mac", "devicetype", "deviceid", "region").Where("\"domain\" = ?", c.basicInfo.Lcuuid).Find(&vinterfaces).Error
if err != nil {
log.Errorf("get own domain resource vinterface failed: (%s)", err.Error(), logger.NewORGPrefix(c.orgID))
return oResource
}

var wanIPs []mysqlmodel.WANIP
err = c.db.DB.Where("domain = ?", c.basicInfo.Lcuuid).Find(&wanIPs).Error
err = c.db.DB.Where("\"domain\" = ?", c.basicInfo.Lcuuid).Find(&wanIPs).Error
if err != nil {
log.Errorf("get own domain resource wan ip failed: (%s)", err.Error(), logger.NewORGPrefix(c.orgID))
return oResource
}

var lanIPs []mysqlmodel.LANIP
err = c.db.DB.Where("domain = ?", c.basicInfo.Lcuuid).Find(&lanIPs).Error
err = c.db.DB.Where("\"domain\" = ?", c.basicInfo.Lcuuid).Find(&lanIPs).Error
if err != nil {
log.Errorf("get own domain resource lan ip failed: (%s)", err.Error(), logger.NewORGPrefix(c.orgID))
return oResource
}

var networks []mysqlmodel.Network
err = c.db.DB.Where("domain = ? AND sub_domain = ''", c.basicInfo.Lcuuid).Find(&networks).Error
err = c.db.DB.Where("\"domain\" = ? AND sub_domain = ''", c.basicInfo.Lcuuid).Find(&networks).Error
if err != nil {
log.Errorf("get own domain resource network failed: (%s)", err.Error(), logger.NewORGPrefix(c.orgID))
return oResource
}

var subnets []mysqlmodel.Subnet
err = c.db.DB.Where("domain = ?", c.basicInfo.Lcuuid).Find(&subnets).Error
err = c.db.DB.Where("\"domain\" = ?", c.basicInfo.Lcuuid).Find(&subnets).Error
if err != nil {
log.Errorf("get own domain resource subnet failed: (%s)", err.Error(), logger.NewORGPrefix(c.orgID))
return oResource
Expand Down
2 changes: 2 additions & 0 deletions server/controller/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ type ControllerConfig struct {
MetadbCfg metadb.Config
PostgreSQLCfg metadb.PostgreSQLConfig `yaml:"postgresql"`
MySqlCfg metadb.MySQLConfig `yaml:"mysql"`
DMCfg metadb.DMConfig `yaml:"dm"`
RedisCfg redis.Config `yaml:"redis"`
ClickHouseCfg clickhouse.ClickHouseConfig `yaml:"clickhouse"`

Expand Down Expand Up @@ -148,6 +149,7 @@ func (c *Config) Load(path string) {
c.ControllerConfig.TrisolarisCfg.SetExportersEnabled(shared_common.ExportersEnabled(path))
c.ControllerConfig.MetadbCfg.InitFromMySQL(c.ControllerConfig.MySqlCfg)
c.ControllerConfig.MetadbCfg.InitFromPostgreSQL(c.ControllerConfig.PostgreSQLCfg)
c.ControllerConfig.MetadbCfg.InitFromDaMeng(c.ControllerConfig.DMCfg)
}

func DefaultConfig() *Config {
Expand Down
1 change: 1 addition & 0 deletions server/controller/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func Start(ctx context.Context, configPath, serverLogFile string, shared *server
serverCfg := config.DefaultConfig()
serverCfg.Load(configPath)
cfg := &serverCfg.ControllerConfig
log.Infof("TODO cfg: %#v", cfg)
bytes, _ := yaml.Marshal(cfg)
log.Info("==================== Launching DeepFlow-Server-Controller ====================")
log.Infof("controller config:\n%s", string(bytes))
Expand Down
Loading
Loading