From 9bddcbcaacca649c4e0686afdde8d5804b17ad9c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 11 十月 2019 09:45:26 +0800
Subject: [PATCH] fix tx
---
agent.go | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/agent.go b/agent.go
index 3504419..b64a425 100644
--- a/agent.go
+++ b/agent.go
@@ -26,6 +26,8 @@
"net"
"os"
"strconv"
+ "sync"
+
//"os"
"strings"
"time"
@@ -80,8 +82,6 @@
}
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")
}
@@ -262,6 +267,7 @@
//a.DeregisterEventHandler(a)
//close(a.readyCh)
}
+
func (a *Agent) BroadcastMemberlist(delay time.Duration) {
//serf := a.serf
@@ -468,6 +474,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) {
@@ -510,25 +517,24 @@
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)
+ go func() {
+ defer wg.Done()
+ for {
+ select {
+ 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
+ }
+ }
+ }()
+ wg.Wait()
return &dumpSqls,nil
//r, err = c.Query([]string{query}, false, false)
--
Gitblit v1.8.0