feat: adds health check warning

deepflowio · Dec 18, 2024 · 0efdb8d · 0efdb8d
1 parent ca79fa8
commit 0efdb8d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/server/controller/controller/controller.go b/server/controller/controller/controller.go
@@ -83,7 +83,7 @@ func Start(ctx context.Context, configPath, serverLogFile string, shared *server
 
 	isMasterController := IsMasterController(cfg)
 	if isMasterController {
-		router.SetInitStageForHealthChecker("MySQL migration")
+		router.SetInitStageForHealthChecker(router.StageMySQLMigration)
 		migrateMySQL(cfg)
 	}
 

diff --git a/server/controller/db/mysql/migrator/schema/script/update_vtap_group_config.go b/server/controller/db/mysql/migrator/schema/script/update_vtap_group_config.go
@@ -57,6 +57,10 @@ func UpgradeVTapAgentConfig(db *gorm.DB) error {
 	}
 	newConfigs := make([]agentconf.MySQLAgentGroupConfiguration, 0)
 	for _, config := range configs {
+		if config.VTapGroupLcuuid == nil {
+			log.Infof("agent_group_configuration (lcuuid: %s) has no vtap_group_lcuuid", *config.Lcuuid)
+			continue
+		}
 		if _, ok := existedNewConfigInfo[*config.VTapGroupLcuuid]; ok {
 			log.Infof("agent_group_configuration (agent_group_lcuuid: %s) already exists", *config.VTapGroupLcuuid)
 			continue

diff --git a/server/controller/http/router/health.go b/server/controller/http/router/health.go
@@ -30,7 +30,11 @@ import (
 
 var log = logger.MustGetLogger("router")
 
-const OK = "ok"
+const (
+	OK = "ok"
+
+	StageMySQLMigration = "MySQL migration"
+)
 
 var curStage string
 var curStageStartedAt time.Time
@@ -46,8 +50,12 @@ func (s *Health) RegisterTo(e *gin.Engine) {
 		if curStage == OK {
 			JsonResponse(c, make(map[string]string), nil)
 		} else {
-			msg := fmt.Sprintf("server is in stage: %s now, time cost: %v", curStage, time.Since(curStageStartedAt))
+			curStageCost := time.Since(curStageStartedAt)
+			msg := fmt.Sprintf("server is in stage: %s now, time cost: %v", curStage, curStageCost)
 			log.Errorf(msg)
+			if curStage == StageMySQLMigration && curStageCost > 30*time.Second {
+				log.Warningf("MySQL migration is taking too long, please add initialDelaySeconds of server to wait for migration to complete")
+			}
 			JsonResponse(
 				c, make(map[string]string),
 				servicecommon.NewError(httpcommon.SERVICE_UNAVAILABLE, msg),