From a79ff0adc62e2d9e3e198d7299e7670063201607 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 14 五月 2020 20:48:39 +0800
Subject: [PATCH] rm no use import
---
agent.go | 77 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/agent.go b/agent.go
index ac0ff1f..f5bb23b 100644
--- a/agent.go
+++ b/agent.go
@@ -167,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])
}
@@ -215,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 {
@@ -232,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)
@@ -449,29 +445,18 @@
//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) {
+func (a *Agent) GetTableDataFromCluster(tableNames []string) (*string, error) {
//members: get name of first member
- mbs := a.GroupMembers(a.conf.ClusterID)
- specmembername := ""
- 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") {
- specmembername = m.Name
- break
- }
- }
- }
+ targetName := a.GetOneAliveNodeId(20 * time.Second)
+
+ if targetName == "" {
+ return nil, errors.New("alive node not found in cluster")
}
- //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)
+ //fmt.Println("mbs:", mbs, "a.conf.BindAddr:", a.conf.BindAddr, "targetName:", targetName)
//query: get db file.
params := serf.QueryParam{
- FilterNodes: strings.Fields(specmembername),
+ FilterNodes: strings.Fields(targetName),
}
//SQL
@@ -485,7 +470,7 @@
var wg sync.WaitGroup
wg.Add(1)
- var dumpSqls []string
+ var dumpSqls string
go func() {
defer wg.Done()
respCh := resp.ResponseCh()
@@ -493,12 +478,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
}
@@ -508,6 +492,39 @@
return &dumpSqls, nil
}
+func (a *Agent) GetOneAliveNodeId(timeOut time.Duration) string {
+ nodeId := ""
+ sTk := time.NewTicker(1 * time.Second)
+ outTk := time.NewTicker(timeOut)
+ defer sTk.Stop()
+ defer outTk.Stop()
+
+ for {
+ select {
+ case <- sTk.C:
+ mbs := a.GroupMembers(a.conf.ClusterID)
+ for _, m := range mbs {
+ //fmt.Println("m", m)
+ if m.Name != a.conf.NodeName { //鍓嶇紑锛欴SVAD:鍒嗘瀽鏈嶅姟鍣� DSPAD:杩涘嚭鍏ad
+ if strings.HasPrefix(a.conf.NodeName, "PAD"){
+ if strings.HasPrefix(m.Name, "PAD") {
+ nodeId = m.Name
+ goto Out
+ }
+ }
+ }
+ }
+ case <-outTk.C:
+ fmt.Println("cannot get alive node from cluster,time out")
+ goto Out
+ default:
+
+ }
+ }
+Out:
+ return nodeId
+}
+
type SqlUserEvent struct {
Owner string `json:"owner"`
Sql []string `json:"sql"`
--
Gitblit v1.8.0