From ade573964a97a77d9652510ff8bcef8d3dfba9b8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 15 八月 2019 14:15:54 +0800
Subject: [PATCH] fix rollback bug
---
agent.go | 85 ++++++++++++++++++++++++++----------------
1 files changed, 52 insertions(+), 33 deletions(-)
diff --git a/agent.go b/agent.go
index 223b16a..4d44c31 100644
--- a/agent.go
+++ b/agent.go
@@ -25,6 +25,7 @@
"io/ioutil"
"net"
"os"
+ "sync"
//"os"
"strings"
@@ -117,14 +118,17 @@
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)
+ //fmt.Println(string(ev.Payload))
+ 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)
}
case *serf.Query:
@@ -185,7 +189,7 @@
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)
@@ -418,7 +422,7 @@
//GetDbFromCluster get the newest database after join cluster
//dbPathWrite the path where to write after got a database,
-func (a *Agent) GetTableDataFromCluster(tableNames []string) error {
+func (a *Agent) GetTableDataFromCluster(tableNames []string) (*[]string,error) {
//members: get name of first member
mbs := a.GroupMembers(a.conf.ClusterID)
var specmembername string
@@ -433,8 +437,7 @@
//query: get db file.
params := serf.QueryParam{
- //FilterNodes: strings.Fields(specmembername),
- FilterNodes: strings.Fields(a.conf.NodeName),
+ FilterNodes: strings.Fields(specmembername),
}
//SQL
@@ -446,25 +449,27 @@
}
fmt.Println("Query.resp.err:",err,"resp:",resp)
- //go func() {
- // respCh := resp.ResponseCh()
- // for {
- // select {
- // case r := <-respCh:
- // fmt.Println("x length is: ", len(r.Payload))
- // // // byte to file.
- // var dumpSqls []string
- // err := json.Unmarshal(r.Payload, &dumpSqls)
- // if err ==nil {
- // if flag,_ := ExecuteSqlByGorm(dumpSqls);flag{
- // fmt.Println("data dump success")
- // }
- // }
- // return
- // }
- // }
- //}()
- return err
+ 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("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")
+ }
+ return
+ }
+ }
+ }()
+ wg.Wait()
+ return &dumpSqls,nil
//r, err = c.Query([]string{query}, false, false)
//if err != nil {
@@ -479,10 +484,24 @@
}
+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("SyncSql", ueB, false)
if err == nil || !strings.Contains(err.Error(), "cannot contain") {
fmt.Println("err: ", err)
}
--
Gitblit v1.8.0