From 1f819a31e020d4c861807245d35f504ed0d910c3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 04 十二月 2019 13:38:27 +0800
Subject: [PATCH] fix specmembername not found,cannot GetTableDataFromCluster
---
agent.go | 88 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 33 deletions(-)
diff --git a/agent.go b/agent.go
index 3504419..71d0439 100644
--- a/agent.go
+++ b/agent.go
@@ -26,6 +26,8 @@
"net"
"os"
"strconv"
+ "sync"
+
//"os"
"strings"
"time"
@@ -59,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
}
@@ -79,8 +81,6 @@
return nil, err
}
serfConf.MemberlistConfig.Keyring = keyring
-
- serfConf.MemberlistConfig.Delegate = &UserDelegate{}
logger.Info("[INFO] agent: Restored keyring with %d keys from %s",
len(conf.EncryptKey), conf.EncryptKey)
@@ -133,11 +133,10 @@
}
if sqlUe.Owner != a.conf.NodeName {
- evTime := uint64(ev.LTime)
- logger.Info("ev.LTime:",evTime,",SqlUserEvent.sql:",sqlUe.Sql)
+ flag, e := ExecuteSqlByGorm(sqlUe.Sql)
- flag, _ := ExecuteSqlByGorm(sqlUe.Sql)
- logger.Info("userEvent exec ",sqlUe.Sql,",Result:",flag)
+ 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))
@@ -215,11 +214,17 @@
}
}
}
+ logger.Debug("targetNode:",targetNode.Name)
if targetNode !=nil {
- sendErr := a.Serf().Memberlist().SendToTCP(targetNode, bytesReturn)
+ addr := targetNode.Addr.String() + ":" + strconv.Itoa(TcpTransportPort)
+ sendErr := rawSendTcpMsg(addr, bytesReturn)
+
if sendErr != nil {
logger.Debug("sendToTcp err:",sendErr)
+ } else {
+ logger.Debug("sendToTcp success")
}
+
} else {
logger.Debug("targetNode is nil")
}
@@ -235,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
}
@@ -262,6 +276,7 @@
//a.DeregisterEventHandler(a)
//close(a.readyCh)
}
+
func (a *Agent) BroadcastMemberlist(delay time.Duration) {
//serf := a.serf
@@ -468,6 +483,7 @@
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) {
@@ -489,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{
@@ -510,25 +529,28 @@
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
- // }
- // }
- //}()
- //wg.Wait()
+ var wg sync.WaitGroup
+ wg.Add(1)
+ ticker := time.NewTicker(300*time.Second)
+ 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)
@@ -576,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
@@ -593,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
@@ -609,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