From 2863a050be2530afc452e48aae8b4be9b3965ebd Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 15 五月 2023 18:18:53 +0800
Subject: [PATCH] add default role tag
---
agent.go | 268 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 236 insertions(+), 32 deletions(-)
diff --git a/agent.go b/agent.go
index f1b2e28..0274499 100644
--- a/agent.go
+++ b/agent.go
@@ -14,39 +14,71 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package serf
+package syncdb
import (
"context"
+ "encoding/json"
"errors"
+ "fmt"
+ "github.com/hashicorp/memberlist"
+ "net"
+ "strconv"
+
"time"
- "github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/hashicorp/serf/cmd/serf/command/agent"
- "github.com/hashicorp/serf/serf"
+ "basic.com/valib/serf.git/cmd/serf/command/agent"
+ "basic.com/valib/serf.git/serf"
+ //"github.com/apache/servicecomb-service-center/pkg/log"
+ "basic.com/valib/logger.git"
)
// Agent warps the serf agent
type Agent struct {
*agent.Agent
- conf *Config
- readyCh chan struct{}
- errorCh chan error
+ ipc *agent.AgentIPC
+ conf *Config
+ readyCh chan struct{}
+ errorCh chan error
+ handleEv HandleEventFunc
+}
+
+//鐢ㄦ埛鑷畾涔変簨浠跺鐞�
+type HandleEventFunc func(event serf.Event)
+
+type NodeInfo struct {
+ ClusterID string `json:"clusterID"`
+ NodeID string `json:"nodeID"`
+ NodeAddress string `json:"nodeAddress"`
+ IsAlive int `json:"isAlive"`
+ Role string `json:"role"`
}
// Create create serf agent with config
-func Create(conf *Config) (*Agent, error) {
+func Create(conf *Config, snapshotPath string) (*Agent, error) {
// config cover to serf config
- serfConf, err := conf.convertToSerf()
+ serfConf, err := conf.convertToSerf(snapshotPath)
if err != nil {
return nil, err
}
// create serf agent with serf config
- serfAgent, err := agent.Create(conf.Config, serfConf, nil)
+ logger.Info("conf.Config.EncryptKey:", conf.EncryptKey)
+ serfAgent, err := agent.Create(conf.Config, serfConf, logger.GetLogFile())
if err != nil {
return nil, err
}
+ // Create the keyring
+ keyring, err := memberlist.NewKeyring(nil, []byte(conf.EncryptKey))
+ if err != nil {
+ logger.Error("Failed to restore keyring: %s", err)
+ return nil, err
+ }
+ serfConf.MemberlistConfig.Keyring = keyring
+
+ logger.Info("[INFO] agent: Restored keyring with %d keys from %s",
+ len(conf.EncryptKey), conf.EncryptKey)
+
return &Agent{
Agent: serfAgent,
conf: conf,
@@ -55,41 +87,109 @@
}, nil
}
-// Start agent
+func (a *Agent) RegisterHandleEventFunc(f HandleEventFunc) {
+ if f != nil {
+ a.handleEv = f
+ }
+}
+
+// Start agent and IPC
func (a *Agent) Start(ctx context.Context) {
+ a.RegisterEventHandler(a)
err := a.Agent.Start()
if err != nil {
- log.Errorf(err, "start serf agent failed")
+ logger.Error(err, "start serf agent failed")
a.errorCh <- err
return
}
- a.RegisterEventHandler(a)
+
+ ipc := a.startIPC()
+ a.ipc = ipc
+ go func() {
+ for {
+ select {
+ case <-ctx.Done():
+ a.Agent.Shutdown()
+ a.ipc.Shutdown()
+ return
+ default:
+ time.Sleep(1*time.Second)
+ }
+ }
+ }()
err = a.retryJoin(ctx)
if err != nil {
- log.Errorf(err, "start serf agent failed")
+ logger.Error(err, "start serf agent failed")
if err != ctx.Err() && a.errorCh != nil {
a.errorCh <- err
}
}
+
+ go a.BroadcastMemberlist(BroadcastInterval * time.Second)
}
+func (a *Agent) startIPC() *agent.AgentIPC {
+ // Parse the bind address information
+ bindIP, bindPort, err := a.conf.AddrParts(a.conf.BindAddr)
+ bindAddr := &net.TCPAddr{IP: net.ParseIP(bindIP), Port: bindPort}
+
+ // Setup the RPC listener
+ rpcListener, err := net.Listen("tcp", a.conf.RPCAddr)
+ if err != nil {
+ logger.Error("Error starting RPC listener:", err)
+ return nil
+ }
+ ipc := agent.NewAgentIPC(a.Agent, a.conf.RPCAuthKey, rpcListener, logger.GetLogFile(), nil)
+ logger.Debug("RPC addr:", a.conf.RPCAddr)
+ logger.Debug("Snapshot:", a.conf.SnapshotPath)
+ logger.Debug("Profile:", a.conf.Profile)
+ logger.Debug("Message Compression Enabled:", a.conf.EnableCompression)
+ logger.Debug("bindAddr:", bindAddr)
+ return ipc
+}
// HandleEvent Handles serf.EventMemberJoin events,
// which will wait for members to join until the number of group members is equal to "groupExpect"
// when the startup mode is "ModeCluster",
// used for logical grouping of serf nodes
func (a *Agent) HandleEvent(event serf.Event) {
- if event.EventType() != serf.EventMemberJoin {
- return
+ if a.handleEv != nil {
+ a.handleEv(event)
}
+}
- if a.conf.Mode == ModeCluster {
- if len(a.GroupMembers(a.conf.ClusterName)) < groupExpect {
- return
- }
+
+func (a *Agent) BroadcastMemberlist(delay time.Duration) {
+ //serf := a.serf
+ serf := a.Agent.Serf()
+ mb := serf.LocalMember()
+ mblist := serf.Memberlist()
+ logger.Info("mb:", mb)
+
+ // copy local node
+ localNode := *mblist.LocalNode()
+ nodeID := a.conf.NodeName
+ nodeAddress := localNode.Address()
+ clusterID := mb.Tags[tagKeyClusterID]
+ isAlive := int(mb.Status)
+
+ message, _ := json.Marshal(NodeInfo{
+ clusterID,
+ nodeID,
+ nodeAddress,
+ isAlive,
+ mb.Tags["role"],
+ })
+
+ // replace node address
+ localNode.Addr = net.ParseIP(BroadcastIP)
+ //localNode.Addr = net.IPv4(255,255,255,255)
+ localNode.Port = BroadcastPort
+ for {
+ // logger.Info("localNode: %v %v\n", nodeName, nodeAddress)
+ mblist.SendBestEffort(&localNode, []byte(message))
+ time.Sleep(delay)
}
- a.DeregisterEventHandler(a)
- close(a.readyCh)
}
// Ready Returns a channel that will be closed when serf is ready
@@ -105,8 +205,8 @@
// Stop serf agent
func (a *Agent) Stop() {
if a.errorCh != nil {
- a.Leave()
- a.Shutdown()
+ logger.Info("a.Shutdown()", a.Leave())
+ logger.Info("a.Shutdown()", a.Shutdown())
close(a.errorCh)
a.errorCh = nil
}
@@ -122,13 +222,13 @@
return nil
}
-// GroupMembers returns a point-in-time snapshot of the members of by groupName
-func (a *Agent) GroupMembers(groupName string) (members []serf.Member) {
+// GroupMembers returns a point-in-time snapshot of the members of by clusterID
+func (a *Agent) GroupMembers(clusterID string) (members []serf.Member) {
serfAgent := a.Agent.Serf()
if serfAgent != nil {
for _, member := range serfAgent.Members() {
- log.Debugf("member = %s, groupName = %s", member.Name, member.Tags[tagKeyClusterName])
- if member.Tags[tagKeyClusterName] == groupName {
+ logger.Info("member = %s, clusterID = %s", member.Name, member.Tags[tagKeyClusterID])
+ if member.Tags[tagKeyClusterID] == clusterID {
members = append(members, member)
}
}
@@ -172,7 +272,7 @@
func (a *Agent) retryJoin(ctx context.Context) (err error) {
if len(a.conf.RetryJoin) == 0 {
- log.Infof("retry join mumber %d", len(a.conf.RetryJoin))
+ logger.Error("retry join mumber %d", len(a.conf.RetryJoin))
return nil
}
@@ -180,13 +280,13 @@
attempt := 0
ticker := time.NewTicker(a.conf.RetryInterval)
for {
- log.Infof("serf: Joining cluster...(replay: %v)", a.conf.ReplayOnJoin)
+ logger.Info("serf: Joining cluster...(replay: %v)", a.conf.ReplayOnJoin)
var n int
// Try to join the specified serf nodes
n, err = a.Join(a.conf.RetryJoin, a.conf.ReplayOnJoin)
if err == nil {
- log.Infof("serf: Join completed. Synced with %d initial agents", n)
+ logger.Error("serf: Join completed. Synced with %d initial agents", n)
break
}
attempt++
@@ -196,7 +296,7 @@
// else agent will try to join other nodes until successful always
if a.conf.RetryMaxAttempts > 0 && attempt > a.conf.RetryMaxAttempts {
err = errors.New("serf: maximum retry join attempts made, exiting")
- log.Errorf(err, err.Error())
+ logger.Error(err, err.Error())
break
}
select {
@@ -211,3 +311,107 @@
ticker.Stop()
return
}
+
+//Init serf Init
+func Init(clusterID string, password string, nodeID string, addrs []string, snapshotPath string, c *Config) (*Agent, error) {
+ agent, err := InitNode(clusterID, password, nodeID, snapshotPath, c)
+ if err != nil {
+ logger.Error("InitNode failed, error: %s", err)
+ return agent, err
+ }
+
+ err = agent.JoinByNodeAddrs(addrs)
+ if err != nil {
+ logger.Error("JoinByNodeIP failed, error: %s", err)
+ return agent, err
+ }
+
+ return agent, err
+}
+
+//InitNode web鍚庡彴鏀跺埌鍒涘缓闆嗙兢鐨勮姹傦紝
+func InitNode(clusterID string, password string, nodeID string, snapshotPath string, c *Config) (*Agent, error) {
+ conf := DefaultConfig()
+ conf.MergeConf(c)
+
+ logger.Info("clusterID:", clusterID, "password:", password, "nodeID:", nodeID)
+ conf.ClusterID = clusterID
+ conf.NodeName = nodeID
+ if password == "" {
+ conf.EncryptKey = DefaultEncryptKey
+ } else {
+ if len(password) >= 16 {
+ password = password[:16]
+ } else {
+ password = fmt.Sprintf("%016s", password)[:16]
+ //return nil, fmt.Errorf("error password")
+ }
+ conf.EncryptKey = password
+ }
+ agent, err := Create(conf, snapshotPath)
+ if err != nil {
+ logger.Error("create agent failed, error: %s", err)
+ return agent, err
+ }
+
+ agent.Start(conf.Ctx)
+ //<- agent.readyCh
+
+ time.Sleep(time.Second)
+ logger.Info("Stats:", agent.Agent.Serf().Stats())
+ logger.Info("EncryptionEnabled:", agent.Agent.Serf().EncryptionEnabled())
+ logger.Info("create agent sucess!!")
+
+ return agent, nil
+}
+
+func (a *Agent) JoinByNodeAddrs(addrs []string) error {
+ var nodes []string
+
+ if len(addrs) == 0 {
+ return fmt.Errorf("No Nodes To Join!")
+ }
+ for _, addr := range addrs {
+ nodes = append(nodes, addr)
+ }
+
+ a.Agent.Join(nodes, true)
+
+ return nil
+}
+
+//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 []NodeInfo) {
+ var node NodeInfo
+ logger.Info("a.conf.ClusterID:", a.conf.ClusterID)
+ mbs := a.GroupMembers(a.conf.ClusterID)
+ for _, mb := range mbs {
+ node.NodeID = mb.Name
+ node.NodeAddress = mb.Addr.String() + ":" + strconv.Itoa(int(mb.Port))
+ node.IsAlive = int(mb.Status)
+ node.ClusterID = mb.Tags[tagKeyClusterID]
+ node.Role = mb.Tags["role"]
+
+ nodes = append(nodes, node)
+ }
+
+ return nodes
+}
--
Gitblit v1.8.0