From a699ff4f66e264d88faa93c0aeee732ca3d9aa1f Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 11 十月 2019 10:01:30 +0800
Subject: [PATCH] add queryResponse timeout

---
 agent.go |   94 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/agent.go b/agent.go
index 0df89b9..0e36706 100644
--- a/agent.go
+++ b/agent.go
@@ -81,6 +81,7 @@
 		return nil, err
 	}
 	serfConf.MemberlistConfig.Keyring = keyring
+
 	logger.Info("[INFO] agent: Restored keyring with %d keys from %s",
 		len(conf.EncryptKey), conf.EncryptKey)
 
@@ -131,11 +132,14 @@
 				return
 			}
 			if sqlUe.Owner != a.conf.NodeName {
-				//results, err := ExecuteWriteSql(sqlArr)
-				flag, _ := ExecuteSqlByGorm(sqlUe.Sql)
-				logger.Info("userEvent exec ",sqlUe.Sql,",Result:",flag)
+
+				flag, e := ExecuteSqlByGorm(sqlUe.Sql)
+
+				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))
 			SyncDbTablePersonCacheChan <- ev.Payload
 		}
 
@@ -185,29 +189,52 @@
 			//for _, r := range rows {
 			//	rowsReturn = append(rowsReturn, *r)
 			//}
-			var tableNames []string
-			err := json.Unmarshal(ev.Payload, &tableNames)
+			var fromP QueryTableDataParam
+			err := json.Unmarshal(ev.Payload, &fromP)
 			if err !=nil {
 				logger.Error("Query tableNames unmarshal err")
 				return
 			}
-			logger.Info("Query tableNames:",tableNames)
-			datas, err := ExecuteQueryByGorm(tableNames)
+			logger.Info("Query tableNames:",fromP.Tables)
+			datas, err := ExecuteQueryByGorm(fromP.Tables)
 			if err !=nil {
 				logger.Error("queryByGorm err")
 				return
 			}
 			bytesReturn, err := json.Marshal(datas)
 			logger.Info("results.len: ", len(bytesReturn))
-			if query, ok := event.(*serf.Query); ok {
-				if err := query.Respond(bytesReturn); err != nil {
-					logger.Error("err: %s\n", err)
-					return
+
+			var targetNode *memberlist.Node
+			nodes := a.Serf().Memberlist().Members()
+			if nodes != nil && len(nodes) > 0 {
+				for _,n :=range nodes {
+					if n.Name == fromP.From {
+						targetNode = n
+						break
+					}
 				}
 			}
+			logger.Debug("targetNode:",targetNode.Name)
+			if targetNode !=nil {
+				addr := targetNode.Addr.String() + ":" + strconv.Itoa(TcpTransportPort)
+				sendErr := rawSendTcpMsg(addr, bytesReturn)
 
-			//var res []*Rows
-			//json.Unmarshal(bytesReturn, &res)
+				if sendErr != nil {
+					logger.Debug("sendToTcp err:",sendErr)
+				} else {
+					logger.Debug("sendToTcp success")
+				}
+
+			} else {
+				logger.Debug("targetNode is nil")
+			}
+
+			//if query, ok := event.(*serf.Query); ok {
+			//	if err := query.Respond(bytesReturn); err != nil {
+			//		logger.Error("err: %s\n", err)
+			//		return
+			//	}
+			//}
 		}
 	case serf.MemberEvent:
 		if event.EventType() == serf.EventMemberLeave {
@@ -240,6 +267,7 @@
 	//a.DeregisterEventHandler(a)
 	//close(a.readyCh)
 }
+
 
 func (a *Agent) BroadcastMemberlist(delay time.Duration) {
 	//serf := a.serf
@@ -286,8 +314,8 @@
 // Stop serf agent
 func (a *Agent) Stop() {
 	if a.errorCh != nil {
-		a.Leave()
-		a.Shutdown()
+		logger.Info("a.Shutdown()", a.Leave())
+		logger.Info("a.Shutdown()", a.Shutdown())
 		close(a.errorCh)
 		a.errorCh = nil
 	}
@@ -441,6 +469,12 @@
 	}()
 }
 
+type QueryTableDataParam struct {
+	Tables []string `json:"tables"`
+	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) {
@@ -468,8 +502,12 @@
 		FilterNodes: strings.Fields(specmembername),
 	}
 
-	//SQL
-	tBytes, _ := json.Marshal(tableNames)
+	//get db tables
+	var fromP = QueryTableDataParam{
+		Tables: tableNames,
+		From: a.conf.NodeName,
+	}
+	tBytes, _ := json.Marshal(fromP)
 
 	resp, err := a.Query(QueryEventUpdateDBData, tBytes, &params)
 	if err == nil || !strings.Contains(err.Error(), "cannot contain") {
@@ -477,25 +515,29 @@
 	}
 	logger.Info("Query.resp.err:",err,"resp:",resp)
 
+	var dumpSqls []string
+
 	var wg sync.WaitGroup
 	wg.Add(1)
-	var dumpSqls []string
-	go func() {
+	ticker := time.NewTicker(300*time.Second)
+	go func(tk *time.Ticker) {
+		defer tk.Stop()
 		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 <-tk.C:
+				return
+			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
 			}
 		}
-	}()
+	}(ticker)
 	wg.Wait()
 	return &dumpSqls,nil
 

--
Gitblit v1.8.0