From ca2652d724c91bcc0849c749d10f2b9af8129a09 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 24 十月 2019 11:35:21 +0800
Subject: [PATCH] fix node leave and join
---
config.go | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/config.go b/config.go
index 68a158b..4b34256 100644
--- a/config.go
+++ b/config.go
@@ -19,7 +19,10 @@
import (
"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"
@@ -43,7 +46,7 @@
BroadcastInterval = 5
MaxQueryRespSize = 50 * 1024 * 1024
MaxQuerySize = 50 * 1024 * 1024
- MaxUserEventSize = 5 * 1024
+ MaxUserEventSize = 9 * 1024
ReplayOnJoinDefault = false
SnapshotPathDefault = "./serfSnapShot"
MaxEventBufferCount = 2048
@@ -88,6 +91,28 @@
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(snapshotPath string) (*serf.Config, error) {
serfConf := serf.DefaultConfig()
@@ -124,7 +149,7 @@
}
c.SnapshotPath = SnapshotPathDefault
- if snapshotPath != "" {
+ if isFileRightful(snapshotPath) {
c.SnapshotPath = snapshotPath
}
--
Gitblit v1.8.0