Skip to content

Commit 88fa4d4

Browse files
ZhengYa-0110SongZhen0704
ZhengYa-0110
authored and
SongZhen0704
committed
feat: gets by page when refreshing recorder cache
1 parent 53c33eb commit 88fa4d4

File tree

4 files changed

+64
-67
lines changed

4 files changed

+64
-67
lines changed

‎server/controller/recorder/cache/cache.go

Lines changed: 23 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,7 @@ func (c *Cache) DeleteVMs(lcuuids []string) {
459459

460460
func (c *Cache) refreshVMs() {
461461
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_VM_EN), c.metadata.LogPrefixes)
462-
var vms []*mysqlmodel.VM
463-
464-
err := c.metadata.DB.Where(c.getConditonDomainCreateMethod()).Find(&vms).Error
462+
vms, err := rcommon.PageWhereFind[mysqlmodel.VM](c.metadata, c.getConditonDomainCreateMethod())
465463
if err != nil {
466464
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_VM_EN, err), c.metadata.LogPrefixes)
467465
return
@@ -521,10 +519,8 @@ func (c *Cache) DeleteNetworks(lcuuids []string) {
521519

522520
func (c *Cache) refreshNetworks() []int {
523521
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_NETWORK_EN), c.metadata.LogPrefixes)
524-
var networks []*mysqlmodel.Network
525522
networkIDs := []int{}
526-
527-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL) AND create_method = ?", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid, ctrlrcommon.CREATE_METHOD_LEARN).Find(&networks).Error
523+
networks, err := rcommon.PageWhereFind[mysqlmodel.Network](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL) AND create_method = ?", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid, ctrlrcommon.CREATE_METHOD_LEARN)
528524
if err != nil {
529525
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_NETWORK_EN, err), c.metadata.LogPrefixes)
530526
return networkIDs
@@ -562,9 +558,7 @@ func (c *Cache) DeleteSubnets(lcuuids []string) {
562558

563559
func (c *Cache) refreshSubnets(networkIDs []int) {
564560
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_SUBNET_EN), c.metadata.LogPrefixes)
565-
var subnets []*mysqlmodel.Subnet
566-
567-
err := c.metadata.DB.Where(map[string]interface{}{"vl2id": networkIDs}).Find(&subnets).Error
561+
subnets, err := rcommon.PageWhereFind[mysqlmodel.Subnet](c.metadata, "vl2id IN ?", networkIDs)
568562
if err != nil {
569563
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_SUBNET_EN, err), c.metadata.LogPrefixes)
570564
return
@@ -597,10 +591,8 @@ func (c *Cache) DeleteVRouters(lcuuids []string) {
597591

598592
func (c *Cache) refreshVRouters() []int {
599593
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_VROUTER_EN), c.metadata.LogPrefixes)
600-
var vrouters []*mysqlmodel.VRouter
601594
vrouterIDs := []int{}
602-
603-
err := c.metadata.DB.Where(c.getConditionDomain()).Find(&vrouters).Error
595+
vrouters, err := rcommon.PageWhereFind[mysqlmodel.VRouter](c.metadata, c.getConditionDomain())
604596
if err != nil {
605597
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_VROUTER_EN, err), c.metadata.LogPrefixes)
606598
return vrouterIDs
@@ -627,9 +619,7 @@ func (c *Cache) DeleteRoutingTables(lcuuids []string) {
627619

628620
func (c *Cache) refreshRoutingTables(vrouterIDs []int) {
629621
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_ROUTING_TABLE_EN), c.metadata.LogPrefixes)
630-
var routingTables []*mysqlmodel.RoutingTable
631-
632-
err := c.metadata.DB.Where(map[string]interface{}{"vnet_id": vrouterIDs}).Find(&routingTables).Error
622+
routingTables, err := rcommon.PageWhereFind[mysqlmodel.RoutingTable](c.metadata, "vnet_id IN ?", vrouterIDs)
633623
if err != nil {
634624
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_ROUTING_TABLE_EN, err), c.metadata.LogPrefixes)
635625
return
@@ -689,9 +679,7 @@ func (c *Cache) DeleteVInterfaces(lcuuids []string) {
689679

690680
func (c *Cache) refreshVInterfaces() {
691681
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_VINTERFACE_EN), c.metadata.LogPrefixes)
692-
var vifs []*mysqlmodel.VInterface
693-
694-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL) AND create_method = ?", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid, ctrlrcommon.CREATE_METHOD_LEARN).Find(&vifs).Error
682+
vifs, err := rcommon.PageWhereFind[mysqlmodel.VInterface](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL) AND create_method = ?", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid, ctrlrcommon.CREATE_METHOD_LEARN)
695683
if err != nil {
696684
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_VINTERFACE_EN, err), c.metadata.LogPrefixes)
697685
return
@@ -716,9 +704,7 @@ func (c *Cache) DeleteWANIPs(lcuuids []string) {
716704

717705
func (c *Cache) refreshWANIPs() {
718706
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_WAN_IP_EN), c.metadata.LogPrefixes)
719-
var wanIPs []*mysqlmodel.WANIP
720-
721-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL) AND create_method = ?", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid, ctrlrcommon.CREATE_METHOD_LEARN).Find(&wanIPs).Error
707+
wanIPs, err := rcommon.PageWhereFind[mysqlmodel.WANIP](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL) AND create_method = ?", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid, ctrlrcommon.CREATE_METHOD_LEARN)
722708
if err != nil {
723709
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_WAN_IP_EN, err), c.metadata.LogPrefixes)
724710
return
@@ -743,9 +729,7 @@ func (c *Cache) DeleteLANIPs(lcuuids []string) {
743729

744730
func (c *Cache) refreshLANIPs() {
745731
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_LAN_IP_EN), c.metadata.LogPrefixes)
746-
var lanIPs []*mysqlmodel.LANIP
747-
748-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL) AND create_method = ?", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid, ctrlrcommon.CREATE_METHOD_LEARN).Find(&lanIPs).Error
732+
lanIPs, err := rcommon.PageWhereFind[mysqlmodel.LANIP](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL) AND create_method = ?", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid, ctrlrcommon.CREATE_METHOD_LEARN)
749733
if err != nil {
750734
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_LAN_IP_EN, err), c.metadata.LogPrefixes)
751735
return
@@ -768,9 +752,7 @@ func (c *Cache) DeleteFloatingIPs(lcuuids []string) {
768752

769753
func (c *Cache) refreshFloatingIPs() {
770754
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_FLOATING_IP_EN), c.metadata.LogPrefixes)
771-
var floatingIPs []*mysqlmodel.FloatingIP
772-
773-
err := c.metadata.DB.Where(c.getConditionDomain()).Find(&floatingIPs).Error
755+
floatingIPs, err := rcommon.PageWhereFind[mysqlmodel.FloatingIP](c.metadata, c.getConditionDomain())
774756
if err != nil {
775757
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_FLOATING_IP_EN, err), c.metadata.LogPrefixes)
776758
return
@@ -880,9 +862,7 @@ func (c *Cache) DeleteLBs(lcuuids []string) {
880862

881863
func (c *Cache) refreshLBs() {
882864
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_LB_EN), c.metadata.LogPrefixes)
883-
var lbs []*mysqlmodel.LB
884-
885-
err := c.metadata.DB.Where(c.getConditionDomain()).Find(&lbs).Error
865+
lbs, err := rcommon.PageWhereFind[mysqlmodel.LB](c.metadata, c.getConditionDomain())
886866
if err != nil {
887867
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_LB_EN, err), c.metadata.LogPrefixes)
888868
return
@@ -932,9 +912,7 @@ func (c *Cache) DeleteLBListeners(lcuuids []string) {
932912

933913
func (c *Cache) refreshLBListeners() {
934914
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_LB_LISTENER_EN), c.metadata.LogPrefixes)
935-
var listeners []*mysqlmodel.LBListener
936-
937-
err := c.metadata.DB.Where(c.getConditionDomain()).Find(&listeners).Error
915+
listeners, err := rcommon.PageWhereFind[mysqlmodel.LBListener](c.metadata, c.getConditionDomain())
938916
if err != nil {
939917
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_LB_LISTENER_EN, err), c.metadata.LogPrefixes)
940918
return
@@ -957,9 +935,7 @@ func (c *Cache) DeleteLBTargetServers(lcuuids []string) {
957935

958936
func (c *Cache) refreshLBTargetServers() {
959937
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_LB_TARGET_SERVER_EN), c.metadata.LogPrefixes)
960-
var servers []*mysqlmodel.LBTargetServer
961-
962-
err := c.metadata.DB.Where(c.getConditionDomain()).Find(&servers).Error
938+
servers, err := rcommon.PageWhereFind[mysqlmodel.LBTargetServer](c.metadata, c.getConditionDomain())
963939
if err != nil {
964940
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_LB_TARGET_SERVER_EN, err), c.metadata.LogPrefixes)
965941
return
@@ -1127,9 +1103,7 @@ func (c *Cache) DeletePodNodes(lcuuids []string) {
11271103

11281104
func (c *Cache) refreshPodNodes() {
11291105
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_POD_NODE_EN), c.metadata.LogPrefixes)
1130-
var podNodes []*mysqlmodel.PodNode
1131-
1132-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid).Find(&podNodes).Error
1106+
podNodes, err := rcommon.PageWhereFind[mysqlmodel.PodNode](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid)
11331107
if err != nil {
11341108
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_NODE_EN, err), c.metadata.LogPrefixes)
11351109
return
@@ -1179,9 +1153,7 @@ func (c *Cache) DeletePodNamespaces(lcuuids []string) {
11791153

11801154
func (c *Cache) refreshPodNamespaces() {
11811155
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_POD_NAMESPACE_EN), c.metadata.LogPrefixes)
1182-
var podNamespaces []*mysqlmodel.PodNamespace
1183-
1184-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid).Find(&podNamespaces).Error
1156+
podNamespaces, err := rcommon.PageWhereFind[mysqlmodel.PodNamespace](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid)
11851157
if err != nil {
11861158
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_NAMESPACE_EN, err), c.metadata.LogPrefixes)
11871159
return
@@ -1210,10 +1182,8 @@ func (c *Cache) DeletePodIngresses(lcuuids []string) {
12101182

12111183
func (c *Cache) refreshPodIngresses() []int {
12121184
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_POD_INGRESS_EN), c.metadata.LogPrefixes)
1213-
var podIngresses []*mysqlmodel.PodIngress
12141185
podIngressIDs := []int{}
1215-
1216-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid).Find(&podIngresses).Error
1186+
podIngresses, err := rcommon.PageWhereFind[mysqlmodel.PodIngress](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid)
12171187
if err != nil {
12181188
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_INGRESS_EN, err), c.metadata.LogPrefixes)
12191189
return podIngressIDs
@@ -1245,9 +1215,8 @@ func (c *Cache) refreshPodIngressRules(podIngressIDs []int) {
12451215
if len(podIngressIDs) == 0 {
12461216
return
12471217
}
1248-
var podIngressRules []*mysqlmodel.PodIngressRule
12491218

1250-
err := c.metadata.DB.Where("pod_ingress_id IN ?", podIngressIDs).Find(&podIngressRules).Error
1219+
podIngressRules, err := rcommon.PageWhereFind[mysqlmodel.PodIngressRule](c.metadata, "pod_ingress_id IN ?", podIngressIDs)
12511220
if err != nil {
12521221
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_INGRESS_RULE_EN, err), c.metadata.LogPrefixes)
12531222
return
@@ -1273,9 +1242,8 @@ func (c *Cache) refreshPodIngresseRuleBackends(podIngressIDs []int) {
12731242
if len(podIngressIDs) == 0 {
12741243
return
12751244
}
1276-
var podIngressRuleBackends []*mysqlmodel.PodIngressRuleBackend
12771245

1278-
err := c.metadata.DB.Where("pod_ingress_id IN ?", podIngressIDs).Find(&podIngressRuleBackends).Error
1246+
podIngressRuleBackends, err := rcommon.PageWhereFind[mysqlmodel.PodIngressRuleBackend](c.metadata, "pod_ingress_id IN ?", podIngressIDs)
12791247
if err != nil {
12801248
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_INGRESS_RULE_BACKEND_EN, err), c.metadata.LogPrefixes)
12811249
return
@@ -1308,10 +1276,8 @@ func (c *Cache) DeletePodServices(lcuuids []string) {
13081276

13091277
func (c *Cache) refreshPodServices() []int {
13101278
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_EN), c.metadata.LogPrefixes)
1311-
var podServices []*mysqlmodel.PodService
13121279
podServiceIDs := []int{}
1313-
1314-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid).Find(&podServices).Error
1280+
podServices, err := rcommon.PageWhereFind[mysqlmodel.PodService](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid)
13151281
if err != nil {
13161282
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_EN, err), c.metadata.LogPrefixes)
13171283
return podServiceIDs
@@ -1341,9 +1307,8 @@ func (c *Cache) refreshPodServicePorts(podServiceIDs []int) {
13411307
if len(podServiceIDs) == 0 {
13421308
return
13431309
}
1344-
var podServicePorts []*mysqlmodel.PodServicePort
13451310

1346-
err := c.metadata.DB.Where("pod_service_id IN ?", podServiceIDs).Find(&podServicePorts).Error
1311+
podServicePorts, err := rcommon.PageWhereFind[mysqlmodel.PodServicePort](c.metadata, "pod_service_id IN ?", podServiceIDs)
13471312
if err != nil {
13481313
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_PORT_EN, err), c.metadata.LogPrefixes)
13491314
return
@@ -1368,9 +1333,7 @@ func (c *Cache) DeletePodGroups(lcuuids []string) {
13681333

13691334
func (c *Cache) refreshPodGroups() {
13701335
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_POD_GROUP_EN), c.metadata.LogPrefixes)
1371-
var podGroups []*mysqlmodel.PodGroup
1372-
1373-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid).Find(&podGroups).Error
1336+
podGroups, err := rcommon.PageWhereFind[mysqlmodel.PodGroup](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid)
13741337
if err != nil {
13751338
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_GROUP_EN, err), c.metadata.LogPrefixes)
13761339
return
@@ -1396,9 +1359,8 @@ func (c *Cache) refreshPodGroupPorts(podServiceIDs []int) {
13961359
if len(podServiceIDs) == 0 {
13971360
return
13981361
}
1399-
var podGroupPorts []*mysqlmodel.PodGroupPort
14001362

1401-
err := c.metadata.DB.Where("pod_service_id IN ?", podServiceIDs).Find(&podGroupPorts).Error
1363+
podGroupPorts, err := rcommon.PageWhereFind[mysqlmodel.PodGroupPort](c.metadata, "pod_service_id IN ?", podServiceIDs)
14021364
if err != nil {
14031365
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_GROUP_PORT_EN, err), c.metadata.LogPrefixes)
14041366
return
@@ -1423,9 +1385,7 @@ func (c *Cache) DeletePodReplicaSets(lcuuids []string) {
14231385

14241386
func (c *Cache) refreshPodReplicaSets() {
14251387
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_POD_REPLICA_SET_EN), c.metadata.LogPrefixes)
1426-
var podReplicaSets []*mysqlmodel.PodReplicaSet
1427-
1428-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid).Find(&podReplicaSets).Error
1388+
podReplicaSets, err := rcommon.PageWhereFind[mysqlmodel.PodReplicaSet](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid)
14291389
if err != nil {
14301390
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_REPLICA_SET_EN, err), c.metadata.LogPrefixes)
14311391
return
@@ -1454,9 +1414,7 @@ func (c *Cache) DeletePods(lcuuids []string) {
14541414

14551415
func (c *Cache) refreshPods() {
14561416
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_POD_EN), c.metadata.LogPrefixes)
1457-
var pods []*mysqlmodel.Pod
1458-
1459-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid).Find(&pods).Error
1417+
pods, err := rcommon.PageWhereFind[mysqlmodel.Pod](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.Domain.Lcuuid, c.metadata.SubDomain.Lcuuid)
14601418
if err != nil {
14611419
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_EN, err), c.metadata.LogPrefixes)
14621420
return

‎server/controller/recorder/common/db.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright (c) 2024 Yunshan Networks
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package common
18+
19+
func PageWhereFind[MT any](md *Metadata, query interface{}, args ...interface{}) ([]*MT, error) {
20+
pageSize := md.Config.MySQLBatchSize
21+
var items []*MT
22+
for pageNum := 1; ; pageNum++ {
23+
var pageItems []*MT
24+
err := md.DB.Where(query, args...).Limit(pageSize).Offset((pageNum - 1) * pageSize).Find(&pageItems).Error
25+
if err != nil {
26+
log.Errorf("failed to find data: %s", err.Error(), md.LogPrefixes)
27+
return nil, err
28+
}
29+
items = append(items, pageItems...)
30+
if len(pageItems) < pageSize {
31+
break
32+
}
33+
}
34+
return items, nil
35+
}

‎server/controller/recorder/common/metadata.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,23 @@ package common
1919
import (
2020
"github.com/deepflowio/deepflow/server/controller/db/mysql"
2121
mysqlmodel "github.com/deepflowio/deepflow/server/controller/db/mysql/model"
22+
"github.com/deepflowio/deepflow/server/controller/recorder/config"
2223
"github.com/deepflowio/deepflow/server/libs/logger"
2324
)
2425

2526
type Metadata struct {
27+
Config config.RecorderConfig
2628
ORGID int // org id
2729
DB *mysql.DB // org database connection
2830
Domain *DomainInfo
2931
SubDomain *SubDomainInfo
3032
LogPrefixes []logger.Prefix
3133
}
3234

33-
func NewMetadata(orgID int) (*Metadata, error) {
35+
func NewMetadata(cfg config.RecorderConfig, orgID int) (*Metadata, error) {
3436
db, err := mysql.GetDB(orgID)
3537
return &Metadata{
38+
Config: cfg,
3639
ORGID: orgID,
3740
DB: db,
3841
Domain: new(DomainInfo),
@@ -43,6 +46,7 @@ func NewMetadata(orgID int) (*Metadata, error) {
4346

4447
func (m *Metadata) Copy() *Metadata {
4548
return &Metadata{
49+
Config: m.Config,
4650
ORGID: m.ORGID,
4751
DB: m.DB,
4852
Domain: m.Domain,

‎server/controller/recorder/recorder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type Recorder struct {
3838

3939
func NewRecorder(ctx context.Context, cfg config.RecorderConfig, eventQueue *queue.OverwriteQueue, orgID int, domainLcuuid string) *Recorder {
4040
log.Infof("domain lcuuid: %s, new recorder", domainLcuuid, logger.NewORGPrefix(orgID))
41-
md, err := common.NewMetadata(orgID)
41+
md, err := common.NewMetadata(cfg, orgID)
4242
if err != nil {
4343
log.Errorf("domain lcuuid: %s, failed to create metadata object: %s", domainLcuuid, err.Error(), logger.NewORGPrefix(orgID))
4444
return nil

0 commit comments

Comments
 (0)