From 15ba78e620fd0c1e7f505cebd4032979676c7eb2 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 28 六月 2022 16:12:50 +0800
Subject: [PATCH] scale MaxUserEventSize to 90k
---
config.go | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/config.go b/config.go
index 35f1793..825a0f5 100644
--- a/config.go
+++ b/config.go
@@ -17,14 +17,17 @@
package syncdb
import (
+ "context"
"fmt"
"net"
+ "os"
"strconv"
+ "strings"
//"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 (
@@ -44,11 +47,10 @@
BroadcastInterval = 5
MaxQueryRespSize = 50 * 1024 * 1024
MaxQuerySize = 50 * 1024 * 1024
- MaxUserEventSize = 5 * 1024
+ MaxUserEventSize = 9 * 1024 * 10
ReplayOnJoinDefault = false
- SnapshotPathDefault = "/opt/vasystem/serfSnapShot"
-
- TcpTransportPort = 30194 //tcp浼犺緭澶ф暟鎹噺鎺ュ彛
+ SnapshotPathDefault = "./serfSnapShot"
+ MaxEventBufferCount = 2048
)
// DefaultConfig default config
@@ -63,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
+ }
}
}
@@ -70,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
@@ -88,8 +117,30 @@
return nil
}
+func isFileRightful(filePath string) bool {
+ if filePath != "" {
+ _, err := os.Stat(filePath)
+ if err != nil && os.IsNotExist(err) {
+ pos := strings.LastIndex(filePath, "/")
+ if pos != -1 {
+ filePath = filePath[0:pos]
+ }
+
+ _, err = os.Stat(filePath)
+ if err == nil || !os.IsNotExist(err) {
+ return true
+ } else {
+ return false
+ }
+ } else {
+ return false
+ }
+ }
+ return false
+}
+
// convertToSerf convert Config to serf.Config
-func (c *Config) convertToSerf() (*serf.Config, error) {
+func (c *Config) convertToSerf(snapshotPath string) (*serf.Config, error) {
serfConf := serf.DefaultConfig()
bindIP, bindPort, err := SplitHostPort(c.BindAddr, DefaultBindPort)
@@ -122,13 +173,19 @@
if c.Mode == ModeCluster && c.RetryMaxAttempts <= 0 {
c.RetryMaxAttempts = retryMaxAttempts
}
+
c.SnapshotPath = SnapshotPathDefault
+ if isFileRightful(snapshotPath) {
+ c.SnapshotPath = snapshotPath
+ }
+
c.ReplayOnJoin = ReplayOnJoinDefault
serfConf.QueryResponseSizeLimit = c.QueryResponseSizeLimit
serfConf.QuerySizeLimit = c.QuerySizeLimit
serfConf.UserEventSizeLimit = c.UserEventSizeLimit
serfConf.SnapshotPath = c.SnapshotPath
+ serfConf.EventBuffer = MaxEventBufferCount
return serfConf, nil
}
--
Gitblit v1.8.0