From ea1f3570e0acefa68a88e5e861213a705f117684 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 14 五月 2020 15:00:02 +0800
Subject: [PATCH] fix ExecuteWriteSql db is nil

---
 agent.go |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/agent.go b/agent.go
index 5b92cb9..3d052b2 100644
--- a/agent.go
+++ b/agent.go
@@ -36,7 +36,6 @@
 	"github.com/hashicorp/serf/serf"
 	//"github.com/apache/servicecomb-service-center/pkg/log"
 	"log"
-	"runtime/debug"
 )
 
 const (
@@ -96,7 +95,7 @@
 // Start agent
 func (a *Agent) Start(ctx context.Context) {
 	log.Println("aaaaaaaaa")
-	log.Println(string(debug.Stack()))
+	//log.Println(string(debug.Stack()))
 	//debug.PrintStack()
 	err := a.Agent.Start()
 	if err != nil {
@@ -168,9 +167,6 @@
 				return
 			}
 			if sqlUe.Owner != a.conf.NodeName {
-				//ExecuteWriteSql(sqlUe.Sql, true)
-				//flag, _ := ExecuteSqlByGorm(sqlUe.Sql)
-				//fmt.Println("userEvent exec 1 ", sqlUe.Sql, ",Result:", results)
 				if receiveSqlInterface != nil && sqlUe.Sql !=nil && len(sqlUe.Sql) > 0 {
 					receiveSqlInterface.Forward(sqlUe.Sql[0])
 				}
@@ -211,16 +207,19 @@
 		} else if ev.Name == QueryEventUpdateDBData {
 			//fmt.Println(string(ev.Payload))
 			var tableNames []string
-			json.Unmarshal(ev.Payload, &tableNames)
+			err := json.Unmarshal(ev.Payload, &tableNames)
+			fmt.Println("androidSync tableNames:", tableNames, "err:", err)
 
 			dumpData := dbDumpH.Dump(strings.Join(tableNames, ","))
 
 			bytesReturn, _ := json.Marshal(dumpData)
-			//fmt.Println("results: ", bytesReturn)
+			fmt.Println("androidSync len(bytesReturn): ", len(bytesReturn))
 			if query, ok := event.(*serf.Query); ok {
 				if err := query.Respond(bytesReturn); err != nil {
-					//fmt.Printf("err: %s\n", err)
+					fmt.Println("androidSync query.Respond err:", err)
 					return
+				} else {
+					fmt.Println("androidSync query.Respond success")
 				}
 			}
 		}
@@ -230,9 +229,8 @@
 				leaveMember := ev.Members[0]
 				leaveSql := "delete from cluster_node where node_id='" + leaveMember.Name + "'"
 				//fmt.Println("leaveSql:", leaveSql)
-				_, err := ExecuteWriteSql([]string{leaveSql}, false)
-				if err != nil {
-					//fmt.Printf("err: %s\n", err)
+				if !DbHandle.Execute(leaveSql) {
+					fmt.Println("DbHandle.Execute ret false")
 				}
 
 				//fmt.Println("EventMemberLeave,current Members:", ev.Members)
@@ -450,7 +448,7 @@
 func (a *Agent) GetTableDataFromCluster(tableNames []string) (*[]string, error) {
 	//members: get name of first member
 	mbs := a.GroupMembers(a.conf.ClusterID)
-	var specmembername string
+	specmembername := ""
 	for _, m := range mbs {
 		//fmt.Println("m", m)
 		if m.Name != a.conf.NodeName { //鍓嶇紑锛欴SVAD:鍒嗘瀽鏈嶅姟鍣� DSPAD:杩涘嚭鍏ad
@@ -459,12 +457,12 @@
 					specmembername = m.Name
 					break
 				}
-			}else{
-				specmembername = m.Name
-				break
 			}
 		}
 	}
+	//if specmembername == "" {
+	//	return nil, errors.New("other pad node not found in memberlist")
+	//}
 	//fmt.Println("mbs:", mbs, "a.conf.BindAddr:", a.conf.BindAddr, "specmembername:", specmembername)
 
 	//query: get db file.
@@ -477,9 +475,9 @@
 
 	resp, err := a.Query(QueryEventUpdateDBData, tBytes, &params)
 	if err == nil || !strings.Contains(err.Error(), "cannot contain") {
-		//fmt.Println("err: ", err)
+		//fmt.Println("QueryEventUpdateDBData err: ")
 	}
-	//fmt.Println("Query.resp.err:", err, "resp:", resp)
+	fmt.Println("Query.resp.err:", err, "resp:", resp)
 
 	var wg sync.WaitGroup
 	wg.Add(1)
@@ -490,11 +488,13 @@
 		for {
 			select {
 			case r := <-respCh:
-				//fmt.Println("Query response's len:", len(r.Payload))
+				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")
+					fmt.Println("dumpSql:", dumpSqls)
+					fmt.Println("data dump success")
+				} else {
+					fmt.Println("Query response.err:", err)
 				}
 				return
 			}

--
Gitblit v1.8.0