From 803756f1de3f52027dbe7cf191c8d4a043a37662 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期五, 27 九月 2019 16:38:32 +0800
Subject: [PATCH] 将fmt改成logger，需要外面初始化logger
---
agent.go | 241 ++++++++++++++++++++++++++++++------------------
1 files changed, 150 insertions(+), 91 deletions(-)
diff --git a/agent.go b/agent.go
index 37e379e..0df89b9 100644
--- a/agent.go
+++ b/agent.go
@@ -25,6 +25,7 @@
"io/ioutil"
"net"
"os"
+ "strconv"
"sync"
//"os"
@@ -34,12 +35,14 @@
"github.com/hashicorp/serf/cmd/serf/command/agent"
"github.com/hashicorp/serf/serf"
//"github.com/apache/servicecomb-service-center/pkg/log"
- "log"
+ "basic.com/valib/logger.git"
)
const (
QueryEventGetDB = "GetDatabase"
QueryEventUpdateDBData = "UpdateDBData"
+ UserEventSyncSql = "SyncSql"
+ UserEventSyncDbTablePersonCache = "SyncCache"
)
// Agent warps the serf agent
@@ -66,7 +69,7 @@
}
// create serf agent with serf config
- fmt.Println("conf.Config.EncryptKey:", conf.EncryptKey)
+ logger.Info("conf.Config.EncryptKey:", conf.EncryptKey)
serfAgent, err := agent.Create(conf.Config, serfConf, nil)
if err != nil {
return nil, err
@@ -74,11 +77,11 @@
// 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{
@@ -93,7 +96,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
}
@@ -101,7 +104,7 @@
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
}
@@ -109,6 +112,8 @@
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"
@@ -118,15 +123,22 @@
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)
-
- for _, result := range results {
- fmt.Println(result, "results err: ", err)
+ 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 {
+ //results, err := ExecuteWriteSql(sqlArr)
+ flag, _ := ExecuteSqlByGorm(sqlUe.Sql)
+ logger.Info("userEvent exec ",sqlUe.Sql,",Result:",flag)
+ }
+ } else if ev.Name == UserEventSyncDbTablePersonCache {
+ SyncDbTablePersonCacheChan <- ev.Payload
}
+
case *serf.Query:
@@ -134,39 +146,39 @@
//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))
+ //logger.Info(string(ev.Payload))
//var tmpstringslice []string
//tmpstringslice = append(tmpstringslice, string(ev.Payload))
- //fmt.Println(tmpstringslice)
+ //logger.Info(tmpstringslice)
//rows, err := ExecuteQuerySql(tmpstringslice)
//if err != nil {
- // fmt.Println("err: ", err)
+ // logger.Error("err: ", err)
// return
//}
//var rowsReturn []Rows
@@ -176,20 +188,20 @@
var tableNames []string
err := json.Unmarshal(ev.Payload, &tableNames)
if err !=nil {
- fmt.Println("Query tableNames unmarshal err")
+ logger.Error("Query tableNames unmarshal err")
return
}
- fmt.Println("Query tableNames:",tableNames)
+ logger.Info("Query tableNames:",tableNames)
datas, err := ExecuteQueryByGorm(tableNames)
if err !=nil {
- fmt.Println("queryByGorm err")
+ logger.Error("queryByGorm err")
return
}
bytesReturn, err := json.Marshal(datas)
- fmt.Println("results.len: ", len(bytesReturn))
+ logger.Info("results.len: ", len(bytesReturn))
if query, ok := event.(*serf.Query); ok {
if err := query.Respond(bytesReturn); err != nil {
- fmt.Printf("err: %s\n", err)
+ logger.Error("err: %s\n", err)
return
}
}
@@ -197,19 +209,31 @@
//var res []*Rows
//json.Unmarshal(bytesReturn, &res)
}
+ 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:
- 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
// }
//}
@@ -222,7 +246,7 @@
serf := a.Agent.Serf()
mb := serf.LocalMember()
mblist := serf.Memberlist()
- fmt.Println("mb:", mb)
+ logger.Info("mb:", mb)
// copy local node
localNode := *mblist.LocalNode()
@@ -243,7 +267,7 @@
//localNode.Addr = net.IPv4(255,255,255,255)
localNode.Port = BroadcastPort
for {
- // fmt.Printf("localNode: %v %v\n", nodeName, nodeAddress)
+ // logger.Info("localNode: %v %v\n", nodeName, nodeAddress)
mblist.SendBestEffort(&localNode, []byte(message))
time.Sleep(delay)
}
@@ -284,7 +308,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)
}
@@ -329,7 +353,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
}
@@ -337,13 +361,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++
@@ -353,7 +377,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 {
@@ -381,7 +405,7 @@
break
}
}
- fmt.Println(specmembername)
+ logger.Info(specmembername)
//query: get db file.
params := serf.QueryParam{
@@ -390,7 +414,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() {
@@ -398,18 +422,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
}
@@ -424,13 +448,20 @@
mbs := a.GroupMembers(a.conf.ClusterID)
var specmembername string
for _, m := range mbs {
- fmt.Println("m",m)
- if m.Name != a.conf.NodeName {
- specmembername = m.Name
- break
+ 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
+ }
}
}
- fmt.Println("mbs:",mbs,"a.conf.BindAddr:",a.conf.BindAddr,"specmembername:",specmembername)
+ logger.Info("mbs:",mbs,"a.conf.BindAddr:",a.conf.BindAddr,"specmembername:",specmembername)
//query: get db file.
params := serf.QueryParam{
@@ -442,9 +473,9 @@
resp, err := a.Query(QueryEventUpdateDBData, tBytes, ¶ms)
if err == nil || !strings.Contains(err.Error(), "cannot contain") {
- fmt.Println("err: ", err)
+ logger.Error("err: ", err)
}
- fmt.Println("Query.resp.err:",err,"resp:",resp)
+ logger.Info("Query.resp.err:",err,"resp:",resp)
var wg sync.WaitGroup
wg.Add(1)
@@ -455,11 +486,11 @@
for {
select {
case r := <-respCh:
- fmt.Println("Query response's len:", len(r.Payload))
+ logger.Info("Query response's len:", len(r.Payload))
err := json.Unmarshal(r.Payload, &dumpSqls)
if err ==nil {
- fmt.Println("dumpSql:",dumpSqls)
- fmt.Println("data dump success")
+ logger.Error("dumpSql:",dumpSqls)
+ logger.Error("data dump success")
}
return
}
@@ -473,7 +504,7 @@
// return err
//}
//for _, x := range r[0].Values {
- // y := fmt.Sprintf("%s;\n", x[0].(string))
+ // y := logger.Info("%s;\n", x[0].(string))
// if _, err := w.Write([]byte(y)); err != nil {
// return err
// }
@@ -481,26 +512,48 @@
}
+type SqlUserEvent struct {
+ Owner string `json:"owner"`
+ Sql []string `json:"sql"`
+}
+
//SyncSql boardcast sql to cluster
-func (a *Agent) SyncSql(sqlOp string) {
+func (a *Agent) SyncSql(sqlOp []string) {
// event : use to send command to operate db.
- err := a.UserEvent("SyncSql", []byte(sqlOp), false)
+ 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") {
- fmt.Println("err: ", err)
+ 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) {
+func Init(clusterID string, password string, nodeID string, addrs []string) (*Agent, error) {
agent, err := InitNode(clusterID, password, nodeID)
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
}
@@ -510,7 +563,7 @@
//InitNode web鍚庡彴鏀跺埌鍒涘缓闆嗙兢鐨勮姹傦紝
func InitNode(clusterID string, password string, nodeID string) (*Agent, error) {
conf := DefaultConfig()
- fmt.Println("clusterID:", clusterID, "password:", password, "nodeID:", nodeID)
+ logger.Info("clusterID:", clusterID, "password:", password, "nodeID:", nodeID)
conf.ClusterID = clusterID
conf.NodeName = nodeID
if password == "" {
@@ -526,7 +579,7 @@
}
agent, err := Create(conf)
if err != nil {
- fmt.Printf("create agent failed, error: %s", err)
+ logger.Error("create agent failed, error: %s", err)
return agent, err
}
@@ -536,50 +589,56 @@
agent.ShutdownCh()
}()
time.Sleep(time.Second)
- fmt.Println("Stats:", agent.Agent.Serf().Stats())
- fmt.Println("EncryptionEnabled:", agent.Agent.Serf().EncryptionEnabled())
- fmt.Println("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
- if len(ips) == 0 {
+ if len(addrs) == 0 {
return fmt.Errorf("No Nodes To Join!")
}
- for _, ip := range ips {
- node := fmt.Sprintf("%s:%d", ip, DefaultBindPort)
- nodes = append(nodes, node)
+ 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)
}
--
Gitblit v1.8.0