From c23884a02a88619ce34dcffb422800a377479db8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 14 五月 2020 20:47:11 +0800
Subject: [PATCH] get members add 20 sec time out
---
agent.go | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/agent.go b/agent.go
index 0faf0bb..e5548c8 100644
--- a/agent.go
+++ b/agent.go
@@ -22,6 +22,7 @@
"errors"
"fmt"
"github.com/hashicorp/memberlist"
+ "github.com/micro/go-micro/logger"
"io/ioutil"
"net"
"os"
@@ -447,27 +448,16 @@
//dbPathWrite the path where to write after got a database,
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, "PAD"){
- if strings.HasPrefix(m.Name, "PAD") {
- specmembername = m.Name
- break
- }
- }
- }
- }
- if specmembername == "" {
+ targetName := a.GetOneAliveNodeId(20 * time.Second)
+
+ if targetName == "" {
return nil, errors.New("alive node not found in cluster")
}
- //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
@@ -503,6 +493,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