[Controller] debug sync by orgid

deepflowio · Jun 17, 2024 · c2cdc98 · c2cdc98
1 parent bb66efb
commit c2cdc98
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/cli/ctl/trisolaris_check.go b/cli/ctl/trisolaris_check.go
@@ -268,6 +268,7 @@ func initCmd(cmd *cobra.Command, cmds []CmdExecute) {
 		groupID = paramData.GroupID
 		clusterID = paramData.ClusterID
 		teamID = paramData.TeamID
+		orgID = paramData.OrgID
 	case "analyzer":
 		name = paramData.Type
 		orgID = paramData.OrgID

diff --git a/server/controller/trisolaris/services/grpc/synchronize/vtap.go b/server/controller/trisolaris/services/grpc/synchronize/vtap.go
@@ -319,8 +319,14 @@ func (e *VTapEvent) Sync(ctx context.Context, in *api.SyncRequest) (*api.SyncRes
 	orgID, teamIDInt := trisolaris.GetOrgInfoByTeamID(teamIDStr)
 	gVTapInfo := trisolaris.GetORGVTapInfo(orgID)
 	if gVTapInfo == nil {
-		log.Errorf("ORGID-%d: ctrlIp is %s, ctrlMac is %s, team_id is (str=%s,int=%d) not found vtapInfo", orgID, ctrlIP, ctrlMac, teamIDStr, teamIDInt)
-		return e.GetFailedResponse(in, gVTapInfo), nil
+		if rOrgID := int(in.GetOrgId()); rOrgID != 0 {
+			orgID = rOrgID
+			gVTapInfo = trisolaris.GetORGVTapInfo(rOrgID)
+		}
+		if gVTapInfo == nil {
+			log.Errorf("ORGID-%d: ctrlIp is %s, ctrlMac is %s, team_id is (str=%s,int=%d) not found vtapInfo", orgID, ctrlIP, ctrlMac, teamIDStr, teamIDInt)
+			return e.GetFailedResponse(in, gVTapInfo), nil
+		}
 	}
 	vtapCacheKey := ctrlIP + "-" + ctrlMac
 	vtapCache, err := e.getVTapCache(in, orgID)

diff --git a/server/controller/trisolaris/trisolaris.go b/server/controller/trisolaris/trisolaris.go
@@ -357,7 +357,6 @@ func NewTrisolarisManager(cfg *config.Config, db *gorm.DB) *TrisolarisManager {
 }
 
 func (m *TrisolarisManager) Start() error {
-	go m.TimedCheckORG()
 	go m.refreshOP.TimedRefreshIPs()
 	m.startTime = getStartTime()
 	orgIDs, err := mysql.GetORGIDs()
@@ -367,9 +366,11 @@ func (m *TrisolarisManager) Start() error {
 	}
 	log.Infof("get orgIDs : %v", orgIDs)
 	trisolaris := NewTrisolaris(m.config, mysql.DefaultDB, m.ctx, m.startTime)
-	trisolaris.Start()
 	m.orgToTrisolaris[DEFAULT_ORG_ID] = trisolaris
-	for _, orgID := range orgIDs {
+	go trisolaris.Start()
+	orgIDsUint32 := make([]uint32, len(orgIDs), len(orgIDs))
+	for index, orgID := range orgIDs {
+		orgIDsUint32[index] = uint32(orgID)
 		if utils.CheckOrgID(orgID) == false || orgID == DEFAULT_ORG_ID {
 			continue
 		}
@@ -379,10 +380,13 @@ func (m *TrisolarisManager) Start() error {
 			continue
 		}
 		trisolaris := NewTrisolaris(m.config, orgDB, m.ctx, m.startTime)
-		trisolaris.Start()
 		m.orgToTrisolaris[orgID] = trisolaris
+		go trisolaris.Start()
 	}
-
+	m.orgIDData = &trident.OrgIDsResponse{
+		OrgIds: orgIDsUint32,
+	}
+	go m.TimedCheckORG()
 	m.getTeamData(orgIDs)
 	log.Infof("finish orgdata init %v", orgIDs)
 	return nil
@@ -496,8 +500,8 @@ func (m *TrisolarisManager) checkORG() {
 					continue
 				}
 				trisolaris := NewTrisolaris(m.config, orgDB, m.ctx, m.startTime)
-				trisolaris.Start()
 				m.orgToTrisolaris[orgID] = trisolaris
+				go trisolaris.Start()
 			}
 		}
 	}