From d1d669670db6df941efc45c26ee4481606e76d82 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 18 九月 2020 20:03:14 +0800
Subject: [PATCH] add lTime
---
agent.go | 511 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 403 insertions(+), 108 deletions(-)
diff --git a/agent.go b/agent.go
index 2fb96b1..5d86f4e 100644
--- a/agent.go
+++ b/agent.go
@@ -23,22 +23,29 @@
"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/serf"
+ "basic.com/valib/serf.git/cmd/serf/command/agent"
//"github.com/apache/servicecomb-service-center/pkg/log"
- "log"
+ "basic.com/valib/logger.git"
+ "github.com/satori/go.uuid"
)
const (
- QueryEventGetDB = "GetDatabase"
+ QueryEventGetDB = "GetDatabase"
QueryEventUpdateDBData = "UpdateDBData"
+ UserEventSyncSql = "SyncSql"
+ UserEventSyncDbTablePersonCache = "SyncCache"
)
+
// Agent warps the serf agent
type Agent struct {
*agent.Agent
@@ -47,28 +54,36 @@
errorCh chan error
}
+type NodeInfo struct {
+ 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
- fmt.Println("conf.Config.EncryptKey:",conf.EncryptKey)
- serfAgent, err := agent.Create(conf.Config, serfConf, nil)
+ logger.Info("conf.Config.EncryptKey:", conf.EncryptKey)
+ serfAgent, err := agent.Create(conf.Config, serfConf, logger.GetLogFile())
if err != nil {
return nil, err
}
// Create the keyring
keyring, err := memberlist.NewKeyring(nil, []byte(conf.EncryptKey))
if err != nil {
- fmt.Printf("Failed to restore keyring: %s", err)
+ logger.Error("Failed to restore keyring: %s", err)
return nil, err
}
serfConf.MemberlistConfig.Keyring = keyring
- fmt.Printf("[INFO] agent: Restored keyring with %d keys from %s",
+
+ logger.Info("[INFO] agent: Restored keyring with %d keys from %s",
len(conf.EncryptKey), conf.EncryptKey)
return &Agent{
@@ -83,7 +98,7 @@
func (a *Agent) Start(ctx context.Context) {
err := a.Agent.Start()
if err != nil {
- log.Println(err, "start serf agent failed")
+ logger.Error(err, "start serf agent failed")
a.errorCh <- err
return
}
@@ -91,12 +106,16 @@
err = a.retryJoin(ctx)
if err != nil {
- log.Println(err, "start serf agent failed")
+ logger.Error(err, "start serf agent failed")
if err != ctx.Err() && a.errorCh != nil {
a.errorCh <- err
}
}
+
+ go a.BroadcastMemberlist(BroadcastInterval * time.Second)
}
+
+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"
@@ -106,93 +125,253 @@
switch ev := event.(type) {
case serf.UserEvent:
- fmt.Println(string(ev.Payload))
- var tmpstringslice []string
- tmpstringslice = append(tmpstringslice, string(ev.Payload))
- fmt.Println(tmpstringslice)
- results, err := ExecuteWriteSql(tmpstringslice)
+ 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
+ }
- for _, result := range results {
- fmt.Println(result, "results err: ", err)
+ 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.Join(sqlUe.Sql, ";")
+ logResult := "0"
+ if flag {
+ logResult = "1"
+ }
+ logErr := ""
+ if e != nil {
+ logErr = e.Error()
+ }
+ ExecuteQueryByGorm([]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))
+ SyncDbTablePersonCacheChan <- ev.Payload
}
+
case *serf.Query:
- if ev.Name == QueryEventGetDB{
+ if ev.Name == QueryEventGetDB {
//bak file and send resp
filename, err := BakDbFile()
if err != nil {
- fmt.Println("bak db file error!")
+ logger.Error("bak db file error!")
return
}
- fmt.Println(filename)
+ logger.Info(filename)
filebuf, err := ioutil.ReadFile(filename)
- fmt.Println("filebuf: ", len(filebuf))
+ logger.Info("filebuf: ", len(filebuf))
if err != nil {
- fmt.Printf("file to []bytes error: %s\n", err)
+ logger.Error("file to []bytes error: %s\n", err)
return
}
err = os.Remove(filename)
if err != nil {
- fmt.Printf("remove file%s\n failed", filename)
+ logger.Error("remove file%s\n failed", filename)
return
}
- fmt.Println("query payload: ", len(ev.Payload))
+ logger.Info("query payload: ", len(ev.Payload))
if query, ok := event.(*serf.Query); ok {
if err := query.Respond(filebuf); err != nil {
- fmt.Printf("err: %s\n", err)
+ logger.Error("err: %s\n", err)
return
}
}
} else if ev.Name == QueryEventUpdateDBData {
- fmt.Println(string(ev.Payload))
- var tmpstringslice []string
- tmpstringslice = append(tmpstringslice, string(ev.Payload))
- fmt.Println(tmpstringslice)
- rows, err := ExecuteQuerySql(tmpstringslice)
- if err != nil {
- fmt.Println("err: ", err)
+ //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)
+ //}
+ 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
}
- var rowsReturn []Rows
- for _,r := range rows {
- rowsReturn = append(rowsReturn, *r)
+ logger.Info("Query tableNames:",fromP.Tables)
+ datas, err := ExecuteQueryByGorm(fromP.Tables)
+ if err !=nil {
+ 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))
- bytesReturn, err := json.Marshal(rowsReturn)
- fmt.Println("results: ", bytesReturn)
- if query, ok := event.(*serf.Query); ok {
- if err := query.Respond(bytesReturn); err != nil {
- fmt.Printf("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 := "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)
+ }
+
+
+ ExecuteQueryByGorm([]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 := "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 := leaveSql
+ logResult := "0"
+ if flag {
+ logResult = "1"
+ }
+ logErr := ""
+ if e != nil {
+ logErr = e.Error()
+ }
+ ExecuteQueryByGorm([]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 := joinSql
+ logResult := "0"
+ if flag {
+ logResult = "1"
+ }
+ logErr := ""
+ if e != nil {
+ logErr = e.Error()
+ }
+ ExecuteQueryByGorm([]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
}
default:
- fmt.Printf("Unknown event type: %s\n", ev.EventType().String())
+ logger.Warn("Unknown event type: %s\n", ev.EventType().String())
}
//if event.EventType() != serf.EventMemberJoin {
- // fmt.Printf("event.EventType() != serf.EventMemberJoin")
+ // logger.Info("event.EventType() != serf.EventMemberJoin")
// return
//}
//
//if a.conf.Mode == ModeCluster {
// if len(a.GroupMembers(a.conf.ClusterID)) < groupExpect {
- // fmt.Printf("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
+ serf := a.Agent.Serf()
+ mb := serf.LocalMember()
+ mblist := serf.Memberlist()
+ logger.Info("mb:", mb)
+
+ // copy local node
+ localNode := *mblist.LocalNode()
+ nodeID := a.conf.NodeName
+ nodeAddress := localNode.Address()
+ clusterID := mb.Tags[tagKeyClusterID]
+ isAlive := int(mb.Status)
+
+ message, _ := json.Marshal(NodeInfo{
+ clusterID,
+ nodeID,
+ nodeAddress,
+ isAlive,
+ })
+
+ // replace node address
+ localNode.Addr = net.ParseIP(BroadcastIP)
+ //localNode.Addr = net.IPv4(255,255,255,255)
+ localNode.Port = BroadcastPort
+ for {
+ // logger.Info("localNode: %v %v\n", nodeName, nodeAddress)
+ mblist.SendBestEffort(&localNode, []byte(message))
+ time.Sleep(delay)
+ }
}
// Ready Returns a channel that will be closed when serf is ready
@@ -208,8 +387,8 @@
// Stop serf agent
func (a *Agent) Stop() {
if a.errorCh != nil {
- a.Leave()
- a.Shutdown()
+ logger.Info("a.Shutdown()", a.Leave())
+ logger.Info("a.Shutdown()", a.Shutdown())
close(a.errorCh)
a.errorCh = nil
}
@@ -230,7 +409,7 @@
serfAgent := a.Agent.Serf()
if serfAgent != nil {
for _, member := range serfAgent.Members() {
- log.Printf("member = %s, clusterID = %s", member.Name, member.Tags[tagKeyClusterID])
+ logger.Info("member = %s, clusterID = %s", member.Name, member.Tags[tagKeyClusterID])
if member.Tags[tagKeyClusterID] == clusterID {
members = append(members, member)
}
@@ -275,7 +454,7 @@
func (a *Agent) retryJoin(ctx context.Context) (err error) {
if len(a.conf.RetryJoin) == 0 {
- log.Printf("retry join mumber %d", len(a.conf.RetryJoin))
+ logger.Error("retry join mumber %d", len(a.conf.RetryJoin))
return nil
}
@@ -283,13 +462,13 @@
attempt := 0
ticker := time.NewTicker(a.conf.RetryInterval)
for {
- log.Printf("serf: Joining cluster...(replay: %v)", a.conf.ReplayOnJoin)
+ logger.Info("serf: Joining cluster...(replay: %v)", a.conf.ReplayOnJoin)
var n int
// Try to join the specified serf nodes
n, err = a.Join(a.conf.RetryJoin, a.conf.ReplayOnJoin)
if err == nil {
- log.Printf("serf: Join completed. Synced with %d initial agents", n)
+ logger.Error("serf: Join completed. Synced with %d initial agents", n)
break
}
attempt++
@@ -299,7 +478,7 @@
// else agent will try to join other nodes until successful always
if a.conf.RetryMaxAttempts > 0 && attempt > a.conf.RetryMaxAttempts {
err = errors.New("serf: maximum retry join attempts made, exiting")
- log.Println(err, err.Error())
+ logger.Error(err, err.Error())
break
}
select {
@@ -317,7 +496,7 @@
//GetDbFromCluster get the newest database after join cluster
//dbPathWrite the path where to write after got a database,
-func (a *Agent)GetDbFromCluster(dbPathWrite string) {
+func (a *Agent) GetDbFromCluster(dbPathWrite string) {
//members: get name of first member
mbs := a.GroupMembers(a.conf.ClusterID)
var specmembername string
@@ -327,7 +506,7 @@
break
}
}
- fmt.Println(specmembername)
+ logger.Info(specmembername)
//query: get db file.
params := serf.QueryParam{
@@ -336,7 +515,7 @@
resp, err := a.Query(QueryEventGetDB, []byte(""), ¶ms)
if err == nil || !strings.Contains(err.Error(), "cannot contain") {
- fmt.Println("err: ", err)
+ logger.Error("err: ", err)
}
go func() {
@@ -344,18 +523,18 @@
for {
select {
case r := <-respCh:
- fmt.Println("x length is: ", len(r.Payload))
+ 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 {
- fmt.Println("query byte to file error!", err)
+ logger.Error("query byte to file error!", err)
}
err := InitDbConn("")
if err != nil {
- fmt.Println("create db conn of test.db error: ", err)
+ logger.Error("create db conn of test.db error: ", err)
}
return
}
@@ -363,26 +542,136 @@
}()
}
-//SyncSql boardcast sql to cluster
-func (a *Agent)SyncSql(sqlOp string) {
- // event : use to send command to operate db.
- err := a.UserEvent("SyncSql", []byte(sqlOp), false)
+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, timeout time.Duration) (*[]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)
+ if specmembername == "" {//濡傛灉鏈壘鍒扮洰鏍囪妭鐐癸紝璇存槑褰撳墠闆嗙兢鍐呴櫎浜嗘湰鑺傜偣锛屾病鏈夊叾浠栧彲鐢ㄨ妭鐐�
+ return nil,errors.New("specmembername not found")
+ }
+
+ //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") {
- fmt.Println("err: ", err)
+ logger.Error("err: ", err)
+ }
+ logger.Info("Query.resp.err:",err,"resp:",resp)
+
+ var dumpSqls []string
+
+ var wg sync.WaitGroup
+ wg.Add(1)
+ ticker := time.NewTicker(timeout)
+ go func(tk *time.Ticker) {
+ defer tk.Stop()
+ defer wg.Done()
+ for {
+ select {
+ 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
+
+ //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, ips []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 {
- fmt.Printf("InitNode failed, error: %s", err)
+ logger.Error("InitNode failed, error: %s", err)
return agent, err
}
- err = agent.JoinByNodeIP(ips)
+ err = agent.JoinByNodeAddrs(addrs)
if err != nil {
- fmt.Printf("JoinByNodeIP failed, error: %s", err)
+ logger.Error("JoinByNodeIP failed, error: %s", err)
return agent, err
}
@@ -390,25 +679,25 @@
}
//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()
- fmt.Println("clusterID:", clusterID, "password:", password, "nodeID:", nodeID)
- //conf.ClusterID = clusterID
+ logger.Info("clusterID:", clusterID, "password:", password, "nodeID:", nodeID)
+ conf.ClusterID = clusterID
conf.NodeName = nodeID
if password == "" {
conf.EncryptKey = DefaultEncryptKey
- }else{
+ } else {
if len(password) >= 16 {
password = password[:16]
- }else{
+ } else {
password = fmt.Sprintf("%016s", password)[:16]
//return nil, fmt.Errorf("error password")
}
conf.EncryptKey = password
}
- agent, err := Create(conf)
+ agent, err := Create(conf, snapshotPath)
if err != nil {
- fmt.Printf("create agent failed, error: %s", err)
+ logger.Error("create agent failed, error: %s", err)
return agent, err
}
@@ -418,53 +707,59 @@
agent.ShutdownCh()
}()
time.Sleep(time.Second)
- fmt.Println("Stats:",agent.Agent.Serf().Stats())
- fmt.Println("EncryptionEnabled:",agent.Agent.Serf().EncryptionEnabled())
- fmt.Printf("create agent sucess!!")
+ logger.Info("Stats:", agent.Agent.Serf().Stats())
+ logger.Info("EncryptionEnabled:", agent.Agent.Serf().EncryptionEnabled())
+ logger.Info("create agent sucess!!")
return agent, nil
}
-func (a *Agent) JoinByNodeIP(ips []string) error {
+func (a *Agent) JoinByNodeAddrs(addrs []string) error {
var nodes []string
- for _, ip := range ips {
- node := fmt.Sprintf("%s:%d", ip, DefaultBindPort)
- nodes = append(nodes, node)
+
+ if len(addrs) == 0 {
+ return fmt.Errorf("No Nodes To Join!")
+ }
+ for _, addr := range addrs {
+ nodes = append(nodes, addr)
}
- n, err := a.Agent.Join(nodes, true)
- if err != nil || n == 0{
- a.Stop()
- fmt.Println("Stop node")
- return fmt.Errorf("Error Encrypt Key!")
- }
+ a.Agent.Join(nodes, true)
- return err
+ return nil
}
-type Node struct {
- clusterID string
- NodeID string
- IP string
- isAlive int //StatusNone:0, StatusAlive:1, StatusLeaving:2, StatusLeft:3, StatusFailed:4
-}
+//func (a *Agent) JoinByNodeIP(ips []string) error {
+// var nodes []string
+//
+// if len(ips) == 0 {
+// return fmt.Errorf("No Nodes To Join!")
+// }
+// for _, ip := range ips {
+// node := fmt.Sprintf("%s:%d", ip, DefaultBindPort)
+// nodes = append(nodes, node)
+// }
+//
+// n, err := a.Agent.Join(nodes, true)
+// if err != nil || n == 0 {
+// return fmt.Errorf("Error Encrypt Key!")
+// }
+//
+// return err
+//}
-func (a *Agent) GetNodes() (nodes []Node) {
- var node Node
- fmt.Println("a.conf.ClusterID:",a.conf.ClusterID)
+func (a *Agent) GetNodes() (nodes []NodeInfo) {
+ var node NodeInfo
+ logger.Info("a.conf.ClusterID:", a.conf.ClusterID)
mbs := a.GroupMembers(a.conf.ClusterID)
for _, mb := range mbs {
node.NodeID = mb.Name
- node.IP = mb.Addr.String()
- node.isAlive = int(mb.Status)
- node.clusterID = mb.Tags[tagKeyClusterID]
+ node.NodeAddress = mb.Addr.String() + ":" + strconv.Itoa(int(mb.Port))
+ node.IsAlive = int(mb.Status)
+ node.ClusterID = mb.Tags[tagKeyClusterID]
nodes = append(nodes, node)
}
return nodes
}
-
-
-
-
--
Gitblit v1.8.0