From 0913731a5f381be02bfafbabddd32446361dbecd Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 19 十月 2020 19:10:30 +0800
Subject: [PATCH] add members clear
---
agent.go | 211 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 155 insertions(+), 56 deletions(-)
diff --git a/agent.go b/agent.go
index 1994157..938cfa3 100644
--- a/agent.go
+++ b/agent.go
@@ -32,10 +32,11 @@
"strings"
"time"
- "github.com/hashicorp/serf/cmd/serf/command/agent"
- "github.com/hashicorp/serf/serf"
+ "basic.com/valib/serf.git/serf"
+ "basic.com/valib/serf.git/cmd/serf/command/agent"
//"github.com/apache/servicecomb-service-center/pkg/log"
"basic.com/valib/logger.git"
+ "github.com/satori/go.uuid"
)
const (
@@ -61,16 +62,16 @@
}
// 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
}
// create serf agent with serf config
logger.Info("conf.Config.EncryptKey:", conf.EncryptKey)
- serfAgent, err := agent.Create(conf.Config, serfConf, nil)
+ serfAgent, err := agent.Create(conf.Config, serfConf, logger.GetLogFile())
if err != nil {
return nil, err
}
@@ -81,12 +82,9 @@
return nil, err
}
serfConf.MemberlistConfig.Keyring = keyring
+
logger.Info("[INFO] agent: Restored keyring with %d keys from %s",
len(conf.EncryptKey), conf.EncryptKey)
-
- ltLock.Lock()
- curLTime = QueryLTimeFromDbByGorm()
- ltLock.Unlock()
return &Agent{
Agent: serfAgent,
@@ -117,9 +115,7 @@
go a.BroadcastMemberlist(BroadcastInterval * time.Second)
}
-var SyncDbTablePersonCacheChan = make(chan []byte,0)
-var curLTime uint64
-var ltLock sync.RWMutex
+var SyncDbTablePersonCacheChan = make(chan []byte,512)
// HandleEvent Handles serf.EventMemberJoin events,
// which will wait for members to join until the number of group members is equal to "groupExpect"
@@ -129,29 +125,34 @@
switch ev := event.(type) {
case serf.UserEvent:
- ltLock.Lock()
- defer ltLock.Unlock()
if ev.Name == UserEventSyncSql {
+ logger.Info("receive a UserEventSyncSql event")
var sqlUe SqlUserEvent
err := json.Unmarshal(ev.Payload, &sqlUe)
if err !=nil {
logger.Error("sqlUe unmarshal err:",err)
return
}
- if sqlUe.Owner != a.conf.NodeName {
- evTime := uint64(ev.LTime)
- logger.Info("ev.LTime:",evTime,",curLTime:",curLTime,",SqlUserEvent.sql:",sqlUe.Sql)
- if curLTime !=0 && evTime < curLTime{//鏄鐞嗚繃鐨勪簨浠�
- logger.Info("already executed event,ev.LTime:",evTime,"SqlUserEvent.sql:",sqlUe.Sql)
- return
- }
- flag, _ := ExecuteSqlByGorm(sqlUe.Sql)
- logger.Info("userEvent exec ",sqlUe.Sql,",Result:",flag)
- if flag {
- curLTime = evTime
- ExecuteSqlByGorm([]string{"update sync_serf set lamport_time='"+strconv.FormatUint(curLTime,10)+"'"})
- }
+ logger.Info("ev.LTime:", ev.LTime ,"owner:", sqlUe.Owner, "sql:", sqlUe.Sql)
+
+ if sqlUe.Owner != a.conf.NodeName {
+ go func() {
+ flag, e := ExecuteSqlByGorm(sqlUe.Sql)
+ logger.Info("ev.LTime:",ev.LTime,"userEvent exec ",sqlUe.Sql,",Result:",flag,", err:",e)
+ logLT := strconv.Itoa(int(ev.LTime))
+ logT := time.Now().Format("2006-01-02 15:04:05")
+ logSql := strings.ReplaceAll(strings.Join(sqlUe.Sql, ";"), "'", "''")
+ logResult := "0"
+ if flag {
+ logResult = "1"
+ }
+ logErr := ""
+ if e != nil {
+ logErr = e.Error()
+ }
+ ExecuteSqlByGorm([]string{"insert into sql_sync_his(`id`,`lTime`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+uuid.NewV4().String()+"','"+ logLT +"','"+logT+"','"+logSql+"','"+sqlUe.Owner+"',"+logResult+",'"+logErr+"')"})
+ }()
}
} else if ev.Name == UserEventSyncDbTablePersonCache {
logger.Info("LTime:",ev.LTime,",ev.Payload.len:",len(ev.Payload))
@@ -204,38 +205,118 @@
//for _, r := range rows {
// rowsReturn = append(rowsReturn, *r)
//}
- var tableNames []string
- err := json.Unmarshal(ev.Payload, &tableNames)
+ logger.Info("receive QueryEventUpdateDBData, current node:", a.conf.NodeName)
+ var fromP QueryTableDataParam
+ err := json.Unmarshal(ev.Payload, &fromP)
if err !=nil {
logger.Error("Query tableNames unmarshal err")
+ if query, ok := event.(*serf.Query); ok {
+ if err := query.Respond([]byte("request unmarshal err")); err != nil {
+ logger.Error("query.Respond err: %s\n", err)
+ return
+ }
+ }
return
}
- logger.Info("Query tableNames:",tableNames)
- datas, err := ExecuteQueryByGorm(tableNames)
+ logger.Info("Query tableNames:",fromP.Tables)
+ datas, err := ExecuteQueryByGorm(fromP.Tables)
if err !=nil {
- logger.Error("queryByGorm err")
+ logger.Error("queryByGorm err:", err)
+ if query, ok := event.(*serf.Query); ok {
+ if err := query.Respond([]byte("queryByGorm err")); err != nil {
+ logger.Error("query.Respond err: %s\n", err)
+ return
+ }
+ }
return
}
bytesReturn, err := json.Marshal(datas)
logger.Info("results.len: ", len(bytesReturn))
- if query, ok := event.(*serf.Query); ok {
- if err := query.Respond(bytesReturn); err != nil {
- logger.Error("err: %s\n", err)
- return
+
+ var targetNode *memberlist.Node
+ nodes := a.Serf().Memberlist().Members()
+ if nodes != nil && len(nodes) > 0 {
+ for _,n :=range nodes {
+ if n.Name == fromP.From {
+ targetNode = n
+ break
+ }
}
}
+ logger.Debug("targetNode:",targetNode.Name)
+ if targetNode !=nil {
+ go func() {
+ addr := targetNode.Addr.String() + ":" + strconv.Itoa(TcpTransportPort)
+ sendErr := rawSendTcpMsg(addr, bytesReturn)
- //var res []*Rows
- //json.Unmarshal(bytesReturn, &res)
+ logLT := strconv.Itoa(int(ev.LTime))
+ logT := time.Now().Format("2006-01-02 15:04:05")
+ logSql := strings.ReplaceAll("QueryEventUpdateDBData from "+targetNode.Name,"'","''")
+ logResult := "0"
+ logErr := ""
+ if sendErr ==nil {
+ logResult = "1"
+ logger.Debug("sendToTcp success")
+ } else {
+ logErr = sendErr.Error()
+ logger.Debug("sendToTcp err:",sendErr)
+ }
+
+
+ ExecuteSqlByGorm([]string{"insert into sql_sync_his(`id`,`lTime`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+uuid.NewV4().String()+"','"+ logLT +"','"+logT+"','"+logSql+"','"+targetNode.Name+"',"+logResult+",'"+logErr+"')"})
+ }()
+ } else {
+ logger.Debug("targetNode is nil")
+ }
+
+ //if query, ok := event.(*serf.Query); ok {
+ // if err := query.Respond(bytesReturn); err != nil {
+ // logger.Error("err: %s\n", err)
+ // return
+ // }
+ //}
}
case serf.MemberEvent:
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+"'"
- ExecuteSqlByGorm([]string{ leaveSql })
+ leaveSql := "update cluster_node set isDelete=1 where node_id='"+leaveMember.Name+"'"
+ flag,e := ExecuteSqlByGorm([]string{ leaveSql })
logger.Info("EventMemberLeave,current Members:",ev.Members)
+ logLT := ""
+ logT := time.Now().Format("2006-01-02 15:04:05")
+ logSql := strings.ReplaceAll(leaveSql, "'","''")
+ logResult := "0"
+ if flag {
+ logResult = "1"
+ }
+ logErr := ""
+ if e != nil {
+ logErr = e.Error()
+ }
+ ExecuteSqlByGorm([]string{"insert into sql_sync_his(`id`,`lTime`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+uuid.NewV4().String()+"','"+ logLT +"','"+logT+"','"+logSql+"','"+leaveMember.Name+"',"+logResult+",'"+logErr+"')"})
+ }
+ return
+ } else if event.EventType() == serf.EventMemberJoin {
+ if ev.Members !=nil && len(ev.Members) ==1 {
+ leaveMember := ev.Members[0]
+ joinSql := "update cluster_node set isDelete=0 where node_id='"+leaveMember.Name+"'"
+ flag,e := ExecuteSqlByGorm([]string{joinSql})
+
+ logger.Info("EventMemberJoin,current Members:",ev.Members)
+ logLT := ""
+ logT := time.Now().Format("2006-01-02 15:04:05")
+ logSql := strings.ReplaceAll(joinSql, "'", "''")
+ logResult := "0"
+ if flag {
+ logResult = "1"
+ }
+ logErr := ""
+ if e != nil {
+ logErr = e.Error()
+ }
+ ExecuteSqlByGorm([]string{"insert into sql_sync_his(`id`,`lTime`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+uuid.NewV4().String()+"','"+ logLT +"','"+logT+"','"+logSql+"','"+leaveMember.Name+"',"+logResult+",'"+logErr+"')"})
}
return
}
@@ -259,6 +340,7 @@
//a.DeregisterEventHandler(a)
//close(a.readyCh)
}
+
func (a *Agent) BroadcastMemberlist(delay time.Duration) {
//serf := a.serf
@@ -460,9 +542,15 @@
}()
}
+type QueryTableDataParam struct {
+ Tables []string `json:"tables"`
+ From string `json:"from"`
+}
+
+var QueryTcpResponseChan = make(chan []byte)
//GetDbFromCluster get the newest database after join cluster
//dbPathWrite the path where to write after got a database,
-func (a *Agent) GetTableDataFromCluster(tableNames []string) (*[]string,error) {
+func (a *Agent) GetTableDataFromCluster(tableNames []string, timeout time.Duration) (*[]string,error) {
//members: get name of first member
mbs := a.GroupMembers(a.conf.ClusterID)
var specmembername string
@@ -481,14 +569,21 @@
}
}
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{
FilterNodes: strings.Fields(specmembername),
}
- //SQL
- tBytes, _ := json.Marshal(tableNames)
+ //get db tables
+ var fromP = QueryTableDataParam{
+ Tables: tableNames,
+ From: a.conf.NodeName,
+ }
+ tBytes, _ := json.Marshal(fromP)
resp, err := a.Query(QueryEventUpdateDBData, tBytes, ¶ms)
if err == nil || !strings.Contains(err.Error(), "cannot contain") {
@@ -496,25 +591,29 @@
}
logger.Info("Query.resp.err:",err,"resp:",resp)
+ var dumpSqls []string
+
var wg sync.WaitGroup
wg.Add(1)
- var dumpSqls []string
- go func() {
+ ticker := time.NewTicker(timeout)
+ go func(tk *time.Ticker) {
+ defer tk.Stop()
defer wg.Done()
- respCh := resp.ResponseCh()
for {
select {
- case r := <-respCh:
- logger.Info("Query response's len:", len(r.Payload))
- err := json.Unmarshal(r.Payload, &dumpSqls)
- if err ==nil {
- logger.Error("dumpSql:",dumpSqls)
+ case <-tk.C:
+ return
+ case msg := <- QueryTcpResponseChan:
+ logger.Info("Query response's len:", len(msg))
+ err := json.Unmarshal(msg, &dumpSqls)
+ if err == nil {
+ logger.Error("dumpSql:", dumpSqls)
logger.Error("data dump success")
}
return
}
}
- }()
+ }(ticker)
wg.Wait()
return &dumpSqls,nil
@@ -563,8 +662,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
@@ -580,7 +679,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
@@ -596,7 +695,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