From 12f52d5835388f22fdecb2a890d58e5425688c8e Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 15 五月 2023 17:43:16 +0800
Subject: [PATCH] add default tag
---
config.go | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/config.go b/config.go
index 79b07a5..ccd6316 100644
--- a/config.go
+++ b/config.go
@@ -19,11 +19,14 @@
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"
- "github.com/hashicorp/serf/serf"
+ "basic.com/valib/serf.git/cmd/serf/command/agent"
+ "basic.com/valib/serf.git/serf"
)
const (
@@ -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()
@@ -112,7 +137,10 @@
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
@@ -124,7 +152,7 @@
}
c.SnapshotPath = SnapshotPathDefault
- if snapshotPath != "" {
+ if isFileRightful(snapshotPath) {
c.SnapshotPath = snapshotPath
}
--
Gitblit v1.8.0