From ea032b4e1973ab1afd4c8d1994bc6a78d99ca7eb Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 14 九月 2020 17:39:28 +0800
Subject: [PATCH] add log
---
agent.go | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/agent.go b/agent.go
index 0e36706..71d0439 100644
--- a/agent.go
+++ b/agent.go
@@ -61,9 +61,9 @@
}
// Create create serf agent with config
-func Create(conf *Config) (*Agent, error) {
+func Create(conf *Config, snapshotPath string) (*Agent, error) {
// config cover to serf config
- serfConf, err := conf.convertToSerf()
+ serfConf, err := conf.convertToSerf(snapshotPath)
if err != nil {
return nil, err
}
@@ -240,10 +240,19 @@
if event.EventType() == serf.EventMemberLeave {
if ev.Members !=nil && len(ev.Members) ==1 {
leaveMember := ev.Members[0]
- leaveSql := "delete from cluster_node where node_id='"+leaveMember.Name+"'"
+ leaveSql := "update cluster_node set isDelete=1 where node_id='"+leaveMember.Name+"'"
ExecuteSqlByGorm([]string{ leaveSql })
logger.Info("EventMemberLeave,current Members:",ev.Members)
+ }
+ return
+ } else if event.EventType() == serf.EventMemberJoin {
+ if ev.Members !=nil && len(ev.Members) ==1 {
+ leaveMember := ev.Members[0]
+ leaveSql := "update cluster_node set isDelete=0 where node_id='"+leaveMember.Name+"'"
+ ExecuteSqlByGorm([]string{ leaveSql })
+
+ logger.Info("EventMemberJoin,current Members:",ev.Members)
}
return
}
@@ -496,6 +505,9 @@
}
}
logger.Info("mbs:",mbs,"a.conf.BindAddr:",a.conf.BindAddr,"specmembername:",specmembername)
+ if specmembername == "" {//濡傛灉鏈壘鍒扮洰鏍囪妭鐐癸紝璇存槑褰撳墠闆嗙兢鍐呴櫎浜嗘湰鑺傜偣锛屾病鏈夊叾浠栧彲鐢ㄨ妭鐐�
+ return nil,errors.New("specmembername not found")
+ }
//query: get db file.
params := serf.QueryParam{
@@ -586,8 +598,8 @@
}
//Init serf Init
-func Init(clusterID string, password string, nodeID string, addrs []string) (*Agent, error) {
- agent, err := InitNode(clusterID, password, nodeID)
+func Init(clusterID string, password string, nodeID string, addrs []string, snapshotPath string) (*Agent, error) {
+ agent, err := InitNode(clusterID, password, nodeID, snapshotPath)
if err != nil {
logger.Error("InitNode failed, error: %s", err)
return agent, err
@@ -603,7 +615,7 @@
}
//InitNode web鍚庡彴鏀跺埌鍒涘缓闆嗙兢鐨勮姹傦紝
-func InitNode(clusterID string, password string, nodeID string) (*Agent, error) {
+func InitNode(clusterID string, password string, nodeID string, snapshotPath string) (*Agent, error) {
conf := DefaultConfig()
logger.Info("clusterID:", clusterID, "password:", password, "nodeID:", nodeID)
conf.ClusterID = clusterID
@@ -619,7 +631,7 @@
}
conf.EncryptKey = password
}
- agent, err := Create(conf)
+ agent, err := Create(conf, snapshotPath)
if err != nil {
logger.Error("create agent failed, error: %s", err)
return agent, err
--
Gitblit v1.8.0