From 112bfee1c46a183beb4942f3a459aacf33d77d09 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期五, 06 九月 2019 17:46:54 +0800
Subject: [PATCH] 服务器只能到服务器去拉取数据
---
agent.go | 82 +++++++++++++++++++++++++++--------------
1 files changed, 54 insertions(+), 28 deletions(-)
diff --git a/agent.go b/agent.go
index a29f8d4..125f421 100644
--- a/agent.go
+++ b/agent.go
@@ -25,6 +25,7 @@
"io/ioutil"
"net"
"os"
+ "strconv"
"sync"
//"os"
@@ -208,6 +209,18 @@
//var res []*Rows
//json.Unmarshal(bytesReturn, &res)
}
+ case serf.MemberEvent:
+ if event.EventType() == serf.EventMemberLeave {
+ if ev.Members !=nil && len(ev.Members) ==1 {
+ leaveMember := ev.Members[0]
+ leaveSql := "delete from cluster_node where node_id='"+leaveMember.Name+"'"
+ ExecuteSqlByGorm([]string{ leaveSql })
+
+ fmt.Println("EventMemberLeave,current Members:",ev.Members)
+ }
+ return
+ }
+
default:
fmt.Printf("Unknown event type: %s\n", ev.EventType().String())
@@ -436,9 +449,16 @@
var specmembername string
for _, m := range mbs {
fmt.Println("m",m)
- if m.Name != a.conf.NodeName {
- specmembername = m.Name
- break
+ if m.Name != a.conf.NodeName { //鍓嶇紑锛欴SVAD:鍒嗘瀽鏈嶅姟鍣� DSPAD:杩涘嚭鍏ad
+ if strings.HasPrefix(a.conf.NodeName, "DSVAD"){
+ if strings.HasPrefix(m.Name, "DSVAD") {
+ specmembername = m.Name
+ break
+ }
+ }else{
+ specmembername = m.Name
+ break
+ }
}
}
fmt.Println("mbs:",mbs,"a.conf.BindAddr:",a.conf.BindAddr,"specmembername:",specmembername)
@@ -524,14 +544,14 @@
}
//Init serf Init
-func Init(clusterID string, password string, nodeID string, ips []string) (*Agent, error) {
+func Init(clusterID string, password string, nodeID string, addrs []string) (*Agent, error) {
agent, err := InitNode(clusterID, password, nodeID)
if err != nil {
fmt.Printf("InitNode failed, error: %s", err)
return agent, err
}
- err = agent.JoinByNodeIP(ips)
+ err = agent.JoinByNodeAddrs(addrs)
if err != nil {
fmt.Printf("JoinByNodeIP failed, error: %s", err)
return agent, err
@@ -576,43 +596,49 @@
return agent, nil
}
-func (a *Agent) JoinByNodeIP(ips []string) error {
+func (a *Agent) JoinByNodeAddrs(addrs []string) error {
var nodes []string
- if len(ips) == 0 {
+ if len(addrs) == 0 {
return fmt.Errorf("No Nodes To Join!")
}
- for _, ip := range ips {
- node := fmt.Sprintf("%s:%d", ip, DefaultBindPort)
- nodes = append(nodes, node)
+ for _, addr := range addrs {
+ nodes = append(nodes, addr)
}
- n, err := a.Agent.Join(nodes, true)
- if err != nil || n == 0 {
- //a.Stop()
- //fmt.Println("Stop node")
- return fmt.Errorf("Error Encrypt Key!")
- }
+ a.Agent.Join(nodes, true)
- return err
+ return nil
}
-type Node struct {
- clusterID string
- NodeID string
- IP string
- isAlive int //StatusNone:0, StatusAlive:1, StatusLeaving:2, StatusLeft:3, StatusFailed:4
-}
+//func (a *Agent) JoinByNodeIP(ips []string) error {
+// var nodes []string
+//
+// if len(ips) == 0 {
+// return fmt.Errorf("No Nodes To Join!")
+// }
+// for _, ip := range ips {
+// node := fmt.Sprintf("%s:%d", ip, DefaultBindPort)
+// nodes = append(nodes, node)
+// }
+//
+// n, err := a.Agent.Join(nodes, true)
+// if err != nil || n == 0 {
+// return fmt.Errorf("Error Encrypt Key!")
+// }
+//
+// return err
+//}
-func (a *Agent) GetNodes() (nodes []Node) {
- var node Node
+func (a *Agent) GetNodes() (nodes []NodeInfo) {
+ var node NodeInfo
fmt.Println("a.conf.ClusterID:", a.conf.ClusterID)
mbs := a.GroupMembers(a.conf.ClusterID)
for _, mb := range mbs {
node.NodeID = mb.Name
- node.IP = mb.Addr.String()
- node.isAlive = int(mb.Status)
- node.clusterID = mb.Tags[tagKeyClusterID]
+ node.NodeAddress = mb.Addr.String() + ":" + strconv.Itoa(int(mb.Port))
+ node.IsAlive = int(mb.Status)
+ node.ClusterID = mb.Tags[tagKeyClusterID]
nodes = append(nodes, node)
}
--
Gitblit v1.8.0