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 28cc7b4..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 {
@@ -131,11 +130,11 @@
}
type DbHandler interface {
- Forward(sql string) bool
+ Execute(sql string) bool
}
type DbDumpHandler interface {
- Forward(tables string) string
+ Dump(tables string) string
}
//鏁版嵁搴揺xecute鍙ユ焺
@@ -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.Forward(strings.Join(tableNames, ","))
+ 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)
@@ -462,9 +460,9 @@
}
}
}
- if specmembername == "" {
- return nil, errors.New("other pad node not found in memberlist")
- }
+ //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.
@@ -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