From d9d407a1b9ccb87298e82ddef206c9799aaf048e Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 05 九月 2019 17:56:19 +0800
Subject: [PATCH] fix dbTables to dbtables
---
agent.go | 97 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 74 insertions(+), 23 deletions(-)
diff --git a/agent.go b/agent.go
index 3fb6939..9081e8c 100644
--- a/agent.go
+++ b/agent.go
@@ -25,6 +25,7 @@
"io/ioutil"
"net"
"os"
+ "sync"
//"os"
"strings"
@@ -39,6 +40,8 @@
const (
QueryEventGetDB = "GetDatabase"
QueryEventUpdateDBData = "UpdateDBData"
+ UserEventSyncSql = "SyncSql"
+ UserEventSyncDbTablePersonCache = "SyncCache"
)
// Agent warps the serf agent
@@ -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"
// when the startup mode is "ModeCluster",
@@ -117,15 +122,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 {
+ fmt.Println("sqlUe unmarshal err:",err)
+ return
+ }
+ if sqlUe.Owner != a.conf.NodeName {
+ //results, err := ExecuteWriteSql(sqlArr)
+ flag, _ := ExecuteSqlByGorm(sqlUe.Sql)
+ fmt.Println("userEvent exec ",sqlUe.Sql,",Result:",flag)
+ }
+ } else if ev.Name == UserEventSyncDbTablePersonCache {
+ SyncDbTablePersonCacheChan <- ev.Payload
}
+
case *serf.Query:
@@ -178,13 +190,14 @@
fmt.Println("Query tableNames unmarshal err")
return
}
+ fmt.Println("Query tableNames:",tableNames)
datas, err := ExecuteQueryByGorm(tableNames)
if err !=nil {
fmt.Println("queryByGorm err")
return
}
bytesReturn, err := json.Marshal(datas)
- fmt.Println("results: ", bytesReturn)
+ fmt.Println("results.len: ", len(bytesReturn))
if query, ok := event.(*serf.Query); ok {
if err := query.Respond(bytesReturn); err != nil {
fmt.Printf("err: %s\n", err)
@@ -195,6 +208,18 @@
//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 })
+
+ fmt.Println("EventMemberLeave,current Members:",ev.Members)
+ }
+ return
+ }
+
default:
fmt.Printf("Unknown event type: %s\n", ev.EventType().String())
@@ -417,17 +442,18 @@
//GetDbFromCluster get the newest database after join cluster
//dbPathWrite the path where to write after got a database,
-func (a *Agent) GetTableDataFromCluster(tableNames []string) (*[]Rows,error) {
+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 {
- if m.Addr.String() != a.conf.BindAddr {
+ fmt.Println("m",m)
+ if m.Name != a.conf.NodeName {
specmembername = m.Name
break
}
}
- fmt.Println(specmembername)
+ fmt.Println("mbs:",mbs,"a.conf.BindAddr:",a.conf.BindAddr,"specmembername:",specmembername)
//query: get db file.
params := serf.QueryParam{
@@ -441,26 +467,29 @@
if err == nil || !strings.Contains(err.Error(), "cannot contain") {
fmt.Println("err: ", err)
}
+ fmt.Println("Query.resp.err:",err,"resp:",resp)
-
+ var wg sync.WaitGroup
+ wg.Add(1)
+ var dumpSqls []string
go func() {
+ defer wg.Done()
respCh := resp.ResponseCh()
for {
select {
case r := <-respCh:
- fmt.Println("x length is: ", len(r.Payload))
- // // byte to file.
- var dumpSqls []string
+ fmt.Println("Query response's len:", len(r.Payload))
err := json.Unmarshal(r.Payload, &dumpSqls)
if err ==nil {
- if flag,_ := ExecuteSqlByGorm(dumpSqls);flag{
- fmt.Println("data dump success")
- }
+ fmt.Println("dumpSql:",dumpSqls)
+ fmt.Println("data dump success")
}
return
}
}
}()
+ wg.Wait()
+ return &dumpSqls,nil
//r, err = c.Query([]string{query}, false, false)
//if err != nil {
@@ -475,12 +504,34 @@
}
+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 {
+ fmt.Println("sqlUE marshal err:",err)
+ return
+ }
+ err = a.UserEvent(UserEventSyncSql, ueB, false)
if err == nil || !strings.Contains(err.Error(), "cannot contain") {
fmt.Println("err: ", err)
+ }
+}
+
+//鏇存柊鍚屾搴撶殑姣斿缂撳瓨
+func (a *Agent) SyncDbTablePersonCache(b []byte) {
+ err := a.UserEvent(UserEventSyncDbTablePersonCache, b, false)
+ if err !=nil{
+ fmt.Println("UserEventSyncDbTablePersonCache err:",err)
}
}
@@ -550,8 +601,8 @@
n, err := a.Agent.Join(nodes, true)
if err != nil || n == 0 {
- a.Stop()
- fmt.Println("Stop node")
+ //a.Stop()
+ //fmt.Println("Stop node")
return fmt.Errorf("Error Encrypt Key!")
}
--
Gitblit v1.8.0