From 34e5eae1c368848300bfa4ea1ead3b5e7c2a8a64 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 10 十月 2019 20:44:30 +0800
Subject: [PATCH] query use tcp transport
---
agent.go | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/agent.go b/agent.go
index fe65539..b64a425 100644
--- a/agent.go
+++ b/agent.go
@@ -82,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)
@@ -135,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))
@@ -217,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")
}
@@ -264,6 +267,7 @@
//a.DeregisterEventHandler(a)
//close(a.readyCh)
}
+
func (a *Agent) BroadcastMemberlist(delay time.Duration) {
//serf := a.serf
@@ -517,22 +521,17 @@
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)
+ 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
- case msg := <-QueryTcpResponseChan:
- logger.Debug("QueryTcpResponseChan receive msg len:",len(msg))
- return
}
-
}
}()
wg.Wait()
--
Gitblit v1.8.0