From 0604f2a6ae1275d1aa2eb2c4c03494f58f64df39 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 14 五月 2020 17:48:15 +0800
Subject: [PATCH] specmembername to PAD
---
agent.go | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/agent.go b/agent.go
index 26f7c74..0faf0bb 100644
--- a/agent.go
+++ b/agent.go
@@ -212,7 +212,7 @@
dumpData := dbDumpH.Dump(strings.Join(tableNames, ","))
- bytesReturn, _ := json.Marshal(dumpData)
+ bytesReturn := []byte(dumpData)
fmt.Println("androidSync len(bytesReturn): ", len(bytesReturn))
if query, ok := event.(*serf.Query); ok {
if err := query.Respond(bytesReturn); err != nil {
@@ -452,17 +452,17 @@
for _, m := range mbs {
//fmt.Println("m", m)
if m.Name != a.conf.NodeName { //鍓嶇紑锛欴SVAD:鍒嗘瀽鏈嶅姟鍣� DSPAD:杩涘嚭鍏ad
- if strings.HasPrefix(a.conf.NodeName, "PSPAD"){
- if strings.HasPrefix(m.Name, "PSPAD") {
+ if strings.HasPrefix(a.conf.NodeName, "PAD"){
+ if strings.HasPrefix(m.Name, "PAD") {
specmembername = m.Name
break
}
}
}
}
- //if specmembername == "" {
- // return nil, errors.New("other pad node not found in memberlist")
- //}
+ if specmembername == "" {
+ return nil, errors.New("alive node not found in cluster")
+ }
//fmt.Println("mbs:", mbs, "a.conf.BindAddr:", a.conf.BindAddr, "specmembername:", specmembername)
//query: get db file.
@@ -489,12 +489,11 @@
select {
case r := <-respCh:
fmt.Println("Query response's len:", len(r.Payload))
- err := json.Unmarshal(r.Payload, &dumpSqls)
- if err == nil {
- fmt.Println("dumpSql:", dumpSqls)
+ dumpSqls = string(r.Payload)
+ if len(dumpSqls) >0 {
fmt.Println("data dump success")
} else {
- fmt.Println("Query response.err:", err)
+ fmt.Println("Query response.len = 0")
}
return
}
--
Gitblit v1.8.0