From a371b5f962bdac6c27155579237eb8ac870e23ce Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 31 五月 2021 16:32:33 +0800
Subject: [PATCH] fix Init arg
---
agent.go | 370 ++++------------------------------------------------
1 files changed, 29 insertions(+), 341 deletions(-)
diff --git a/agent.go b/agent.go
index 974a29f..22dbcfd 100644
--- a/agent.go
+++ b/agent.go
@@ -22,55 +22,47 @@
"errors"
"fmt"
"github.com/hashicorp/memberlist"
- "io/ioutil"
"net"
- "os"
"strconv"
- "sync"
- //"os"
- "strings"
"time"
- "github.com/hashicorp/serf/cmd/serf/command/agent"
- "github.com/hashicorp/serf/serf"
+ "basic.com/valib/serf.git/cmd/serf/command/agent"
+ "basic.com/valib/serf.git/serf"
//"github.com/apache/servicecomb-service-center/pkg/log"
"basic.com/valib/logger.git"
-)
-
-const (
- QueryEventGetDB = "GetDatabase"
- QueryEventUpdateDBData = "UpdateDBData"
- UserEventSyncSql = "SyncSql"
- UserEventSyncDbTablePersonCache = "SyncCache"
)
// Agent warps the serf agent
type Agent struct {
*agent.Agent
- conf *Config
- readyCh chan struct{}
- errorCh chan error
+ conf *Config
+ readyCh chan struct{}
+ errorCh chan error
+ handleEv HandleEventFunc
}
+//鐢ㄦ埛鑷畾涔変簨浠跺鐞�
+type HandleEventFunc func(event serf.Event)
+
type NodeInfo struct {
- ClusterID string `json:"clusterID"`
- NodeID string `json:"nodeID"`
- NodeAddress string `json:"nodeAddress"`
- IsAlive int `json:"isAlive"`
+ ClusterID string `json:"clusterID"`
+ NodeID string `json:"nodeID"`
+ NodeAddress string `json:"nodeAddress"`
+ IsAlive int `json:"isAlive"`
}
// 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
}
@@ -82,8 +74,6 @@
}
serfConf.MemberlistConfig.Keyring = keyring
- serfConf.MemberlistConfig.Delegate = &UserDelegate{}
-
logger.Info("[INFO] agent: Restored keyring with %d keys from %s",
len(conf.EncryptKey), conf.EncryptKey)
@@ -93,6 +83,12 @@
readyCh: make(chan struct{}),
errorCh: make(chan error),
}, nil
+}
+
+func (a *Agent) RegisterHandleEventFunc(f HandleEventFunc) {
+ if f != nil {
+ a.handleEv = f
+ }
}
// Start agent
@@ -116,153 +112,16 @@
go a.BroadcastMemberlist(BroadcastInterval * time.Second)
}
-var SyncDbTablePersonCacheChan = make(chan []byte,0)
-
// HandleEvent Handles serf.EventMemberJoin events,
// which will wait for members to join until the number of group members is equal to "groupExpect"
// when the startup mode is "ModeCluster",
// used for logical grouping of serf nodes
func (a *Agent) HandleEvent(event serf.Event) {
-
- switch ev := event.(type) {
- case serf.UserEvent:
- if ev.Name == UserEventSyncSql {
- 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 {
-
- flag, e := ExecuteSqlByGorm(sqlUe.Sql)
-
- evTime := uint64(ev.LTime)
- logger.Info("ev.LTime:",evTime,"userEvent exec ",sqlUe.Sql,",Result:",flag,", err:",e)
- }
- } else if ev.Name == UserEventSyncDbTablePersonCache {
- logger.Info("LTime:",ev.LTime,",ev.Payload.len:",len(ev.Payload))
- SyncDbTablePersonCacheChan <- ev.Payload
- }
-
-
- case *serf.Query:
-
- if ev.Name == QueryEventGetDB {
- //bak file and send resp
- filename, err := BakDbFile()
- if err != nil {
- logger.Error("bak db file error!")
- return
- }
- logger.Info(filename)
-
- filebuf, err := ioutil.ReadFile(filename)
- logger.Info("filebuf: ", len(filebuf))
- if err != nil {
- logger.Error("file to []bytes error: %s\n", err)
- return
- }
-
- err = os.Remove(filename)
- if err != nil {
- logger.Error("remove file%s\n failed", filename)
- return
- }
-
- logger.Info("query payload: ", len(ev.Payload))
- if query, ok := event.(*serf.Query); ok {
- if err := query.Respond(filebuf); err != nil {
- logger.Error("err: %s\n", err)
- return
- }
- }
- } else if ev.Name == QueryEventUpdateDBData {
- //logger.Info(string(ev.Payload))
- //var tmpstringslice []string
- //tmpstringslice = append(tmpstringslice, string(ev.Payload))
- //logger.Info(tmpstringslice)
- //rows, err := ExecuteQuerySql(tmpstringslice)
- //if err != nil {
- // logger.Error("err: ", err)
- // return
- //}
- //var rowsReturn []Rows
- //for _, r := range rows {
- // rowsReturn = append(rowsReturn, *r)
- //}
- var fromP QueryTableDataParam
- err := json.Unmarshal(ev.Payload, &fromP)
- if err !=nil {
- logger.Error("Query tableNames unmarshal err")
- return
- }
- logger.Info("Query tableNames:",fromP.Tables)
- datas, err := ExecuteQueryByGorm(fromP.Tables)
- if err !=nil {
- logger.Error("queryByGorm err")
- return
- }
- bytesReturn, err := json.Marshal(datas)
- logger.Info("results.len: ", len(bytesReturn))
-
- 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
- }
- }
- }
- if targetNode !=nil {
- sendErr := a.Serf().Memberlist().SendToTCP(targetNode, bytesReturn)
- if sendErr != nil {
- logger.Debug("sendToTcp err:",sendErr)
- }
- } 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 })
-
- logger.Info("EventMemberLeave,current Members:",ev.Members)
- }
- return
- }
-
-
- default:
- logger.Warn("Unknown event type: %s\n", ev.EventType().String())
+ if a.handleEv != nil {
+ a.handleEv(event)
}
-
- //if event.EventType() != serf.EventMemberJoin {
- // logger.Info("event.EventType() != serf.EventMemberJoin")
- // return
- //}
- //
- //if a.conf.Mode == ModeCluster {
- // if len(a.GroupMembers(a.conf.ClusterID)) < groupExpect {
- // logger.Error("len(a.GroupMembers(a.conf.ClusterID)) < groupExpect")
- // return
- // }
- //}
- //a.DeregisterEventHandler(a)
- //close(a.readyCh)
}
+
func (a *Agent) BroadcastMemberlist(delay time.Duration) {
//serf := a.serf
@@ -416,180 +275,9 @@
return
}
-//GetDbFromCluster get the newest database after join cluster
-//dbPathWrite the path where to write after got a database,
-func (a *Agent) GetDbFromCluster(dbPathWrite string) {
- //members: get name of first member
- mbs := a.GroupMembers(a.conf.ClusterID)
- var specmembername string
- for _, m := range mbs {
- if m.Addr.String() != a.conf.BindAddr {
- specmembername = m.Name
- break
- }
- }
- logger.Info(specmembername)
-
- //query: get db file.
- params := serf.QueryParam{
- FilterNodes: strings.Fields(specmembername),
- }
-
- resp, err := a.Query(QueryEventGetDB, []byte(""), ¶ms)
- if err == nil || !strings.Contains(err.Error(), "cannot contain") {
- logger.Error("err: ", err)
- }
-
- go func() {
- respCh := resp.ResponseCh()
- for {
- select {
- case r := <-respCh:
- logger.Info("x length is: ", len(r.Payload))
-
- // // byte to file.
- SerfDbConn.Close()
- SerfDbConn = nil
- err = ioutil.WriteFile(dbPathWrite, r.Payload, 0644)
- if err != nil {
- logger.Error("query byte to file error!", err)
- }
- err := InitDbConn("")
- if err != nil {
- logger.Error("create db conn of test.db error: ", err)
- }
- return
- }
- }
- }()
-}
-
-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) {
- //members: get name of first member
- mbs := a.GroupMembers(a.conf.ClusterID)
- var specmembername string
- for _, m := range mbs {
- logger.Info("m",m)
- if m.Name != a.conf.NodeName { //鍓嶇紑锛欴SVAD:鍒嗘瀽鏈嶅姟鍣� DSPAD:杩涘嚭鍏ad
- if strings.HasPrefix(a.conf.NodeName, "DSVAD"){
- if strings.HasPrefix(m.Name, "DSVAD") {
- specmembername = m.Name
- break
- }
- }else{
- specmembername = m.Name
- break
- }
- }
- }
- logger.Info("mbs:",mbs,"a.conf.BindAddr:",a.conf.BindAddr,"specmembername:",specmembername)
-
- //query: get db file.
- params := serf.QueryParam{
- FilterNodes: strings.Fields(specmembername),
- }
-
- //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") {
- logger.Error("err: ", err)
- }
- logger.Info("Query.resp.err:",err,"resp:",resp)
-
- var dumpSqls []string
-
- var wg sync.WaitGroup
- wg.Add(1)
- go func() {
- 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)
- // logger.Error("data dump success")
- // }
- // return
- case msg := <-QueryTcpResponseChan:
- logger.Debug("QueryTcpResponseChan receive msg len:",len(msg))
- err := json.Unmarshal(msg, &dumpSqls)
- if err ==nil {
- logger.Error("dumpSql success:",dumpSqls)
- } else {
- logger.Error("data dump err:",err)
- }
- return
- }
-
- }
- }()
- wg.Wait()
- return &dumpSqls,nil
-
- //r, err = c.Query([]string{query}, false, false)
- //if err != nil {
- // return err
- //}
- //for _, x := range r[0].Values {
- // y := logger.Info("%s;\n", x[0].(string))
- // if _, err := w.Write([]byte(y)); err != nil {
- // return err
- // }
- //}
-
-}
-
-type SqlUserEvent struct {
- Owner string `json:"owner"`
- Sql []string `json:"sql"`
-}
-
-//SyncSql boardcast sql to cluster
-func (a *Agent) SyncSql(sqlOp []string) {
- // event : use to send command to operate db.
- var sqlUe = SqlUserEvent{
- Owner: a.conf.NodeName,
- Sql: sqlOp,
- }
- ueB, err := json.Marshal(sqlUe)
- if err !=nil {
- logger.Error("sqlUE marshal err:",err)
- return
- }
- err = a.UserEvent(UserEventSyncSql, ueB, false)
- if err == nil || !strings.Contains(err.Error(), "cannot contain") {
- logger.Error("err: ", err)
- }
-}
-
-//鏇存柊鍚屾搴撶殑姣斿缂撳瓨
-func (a *Agent) SyncDbTablePersonCache(b []byte) {
- err := a.UserEvent(UserEventSyncDbTablePersonCache, b, false)
- if err !=nil{
- logger.Error("UserEventSyncDbTablePersonCache err:",err)
- }
-}
-
//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
@@ -605,7 +293,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
@@ -621,7 +309,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