From bf2b61519fd0d79ddb19f0469749fbbe1d6c4ad8 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 19 十月 2023 17:23:50 +0800
Subject: [PATCH] 为保证正确获取集群状态, 添加程序启动时读取system-service运行状态
---
main.go | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/main.go b/main.go
index 8c631f7..8f852e5 100644
--- a/main.go
+++ b/main.go
@@ -30,6 +30,7 @@
// 鍚姩鏁版嵁鍚屾
var serfStartChan = make(chan bool)
+
// 闇�瑕佸悓姝ョ殑琛�
var syncTables = []string{
"procedures",
@@ -41,8 +42,12 @@
agent := serf.InitAgent("apsClient", syncTables, sqlitex.GetDB())
agent.RegisterClusterEvent(serfClusterEvent)
+
go agent.Serve(serfStartChan)
- <-serfStartChan
+ if !<-serfStartChan {
+ logx.Errorf("serf Init err, exit")
+ return
+ }
// 鍒ゆ柇褰撳墠闆嗙兢鐘舵��
if agent.ClusterStatus != "slave" {
@@ -50,11 +55,12 @@
logx.Errorf("nsq Init err:%v", err)
return
}
- crontask.Once()
- if err := crontask.StartTask(); err != nil {
- logx.Errorf("crontab task Init err:%v", err)
- return
- }
+
+ }
+ crontask.Once(agent.ClusterStatus != "slave")
+ if err := crontask.StartTask(agent.ClusterStatus != "slave"); err != nil {
+ logx.Errorf("crontab task Init err:%v", err)
+ return
}
logx.Infof("apsClient start serve...")
@@ -70,18 +76,22 @@
func serfClusterEvent(stat int) {
switch stat {
case serf.EventCreateCluster, serf.EventSlave2Master, serf.EventLeaveCluster:
- if err := nsq.Init(); err != nil {
+ if err := nsq.Init(); err != nil { //寮�鍚痭sq
logx.Errorf("nsq Init err:%v", err)
return
}
- crontask.Once()
- if err := crontask.StartTask(); err != nil {
+ crontask.Once(true)
+ if err := crontask.RestartTask(true); err != nil { //浠aster鏂瑰紡閲嶅惎task
logx.Errorf("crontab task Init err:%v", err)
return
}
case serf.EventJoinCluster, serf.EventMaster2Slave:
- nsq.Stop()
- crontask.StopTask()
+ nsq.Stop() //鍏抽棴nsq
+ crontask.Once(false)
+ if err := crontask.RestartTask(false); err != nil { //浠ラ潪master鏂瑰紡閲嶅惎task
+ logx.Errorf("crontab task Init err:%v", err)
+ return
+ }
}
logx.Infof("serf cluster event: %v", stat)
--
Gitblit v1.8.0