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
---
config.go | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/config.go b/config.go
index 4b34256..ac65ecc 100644
--- a/config.go
+++ b/config.go
@@ -17,6 +17,7 @@
package syncdb
import (
+ "context"
"fmt"
"net"
"os"
@@ -25,8 +26,8 @@
//"github.com/apache/servicecomb-service-center/syncer/pkg/utils"
"github.com/hashicorp/memberlist"
- "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"
)
const (
@@ -46,12 +47,10 @@
BroadcastInterval = 5
MaxQueryRespSize = 50 * 1024 * 1024
MaxQuerySize = 50 * 1024 * 1024
- MaxUserEventSize = 9 * 1024
+ MaxUserEventSize = 9 * 1024 * 10
ReplayOnJoinDefault = false
SnapshotPathDefault = "./serfSnapShot"
MaxEventBufferCount = 2048
-
- TcpTransportPort = 30194 //tcp浼犺緭澶ф暟鎹噺鎺ュ彛
)
// DefaultConfig default config
@@ -66,6 +65,32 @@
Mode: ModeSingle,
Config: agentConf,
ClusterPort: DefaultClusterPort,
+ Ctx: context.Background(),
+ }
+}
+
+func (c *Config) MergeConf(s *Config) {
+ if s != nil {
+ if s.Ctx != nil {
+ c.Ctx = s.Ctx
+ } else {
+ c.Ctx = context.Background()
+ }
+ c.BindAddr = s.BindAddr
+ c.RPCAddr = s.RPCAddr
+ c.RPCPort = s.RPCPort
+ //serf蹇収鍦板潃
+ if s.SnapshotPath != "" {
+ c.SnapshotPath = s.SnapshotPath
+ }
+ if s.EncryptKey != "" {
+ //鎶ユ枃鍔犲瘑鐨刱ey
+ c.EncryptKey = s.EncryptKey
+ }
+ if s.RPCAuthKey != "" {
+ //RPC璁よ瘉鐨刱ey
+ c.RPCAuthKey = s.RPCAuthKey
+ }
}
}
@@ -73,14 +98,15 @@
type Config struct {
// config from serf agent
*agent.Config
- Mode string `json:"mode"`
+ Mode string `json:"mode"`
// name to group members into cluster
- ClusterID string `json:"cluster_name"`
+ ClusterID string `json:"cluster_name"`
// port to communicate between cluster members
- ClusterPort int `yaml:"cluster_port"`
- RPCPort int `yaml:"-"`
+ ClusterPort int `yaml:"cluster_port"`
+ RPCPort int `yaml:"-"`
+ Ctx context.Context
}
// readConfigFile reads configuration from config file
@@ -137,7 +163,7 @@
serfConf.MemberlistConfig.BindPort = bindPort
serfConf.NodeName = c.NodeName
- serfConf.Tags = map[string]string{TagKeyRPCPort: strconv.Itoa(c.RPCPort)}
+ serfConf.Tags = map[string]string{TagKeyRPCPort: strconv.Itoa(c.RPCPort), "role": "slave"}
if c.ClusterID != "" {
serfConf.Tags[tagKeyClusterID] = c.ClusterID
--
Gitblit v1.8.0