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 | 111 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 22 deletions(-)
diff --git a/agent.go b/agent.go
index c876f39..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 (
@@ -70,7 +71,7 @@
// 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
}
@@ -114,7 +115,7 @@
go a.BroadcastMemberlist(BroadcastInterval * time.Second)
}
-var SyncDbTablePersonCacheChan = make(chan []byte,0)
+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"
@@ -125,18 +126,33 @@
switch ev := event.(type) {
case serf.UserEvent:
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
}
+
+ logger.Info("ev.LTime:", ev.LTime ,"owner:", sqlUe.Owner, "sql:", sqlUe.Sql)
+
if sqlUe.Owner != a.conf.NodeName {
-
- flag, e := ExecuteSqlByGorm(sqlUe.Sql)
-
- evTime := uint64(ev.LTime)
- logger.Info("ev.LTime:",evTime,"userEvent exec ",sqlUe.Sql,",Result:",flag,", err:",e)
+ 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))
@@ -189,16 +205,29 @@
//for _, r := range rows {
// rowsReturn = append(rowsReturn, *r)
//}
+ 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:",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)
@@ -216,15 +245,26 @@
}
logger.Debug("targetNode:",targetNode.Name)
if targetNode !=nil {
- addr := targetNode.Addr.String() + ":" + strconv.Itoa(TcpTransportPort)
- sendErr := rawSendTcpMsg(addr, bytesReturn)
+ go func() {
+ addr := targetNode.Addr.String() + ":" + strconv.Itoa(TcpTransportPort)
+ sendErr := rawSendTcpMsg(addr, bytesReturn)
- if sendErr != nil {
- logger.Debug("sendToTcp err:",sendErr)
- } else {
- logger.Debug("sendToTcp success")
- }
+ 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")
}
@@ -241,18 +281,42 @@
if ev.Members !=nil && len(ev.Members) ==1 {
leaveMember := ev.Members[0]
leaveSql := "update cluster_node set isDelete=1 where node_id='"+leaveMember.Name+"'"
- ExecuteSqlByGorm([]string{ leaveSql })
+ 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]
- leaveSql := "update cluster_node set isDelete=0 where node_id='"+leaveMember.Name+"'"
- ExecuteSqlByGorm([]string{ leaveSql })
+ 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
}
@@ -486,7 +550,7 @@
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
@@ -505,6 +569,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{
@@ -528,7 +595,7 @@
var wg sync.WaitGroup
wg.Add(1)
- ticker := time.NewTicker(300*time.Second)
+ ticker := time.NewTicker(timeout)
go func(tk *time.Ticker) {
defer tk.Stop()
defer wg.Done()
--
Gitblit v1.8.0