[feat] add toolsv2

Signed-off-by: Cyber-SiKu <[email protected]>

Author: Cyber-SiKu

internal/configure/topology/dc_get.go

@@ -43,16 +43,19 @@ const (
 	LAYOUT_SERVICE_LOG_DIR                  = "/logs"
 	LAYOUT_SERVICE_DATA_DIR                 = "/data"
 	LAYOUT_TOOLS_DIR                        = "/tools"
+	LAYOUT_TOOLS_V2_DIR                     = "/tools-v2"
 	LAYOUT_CURVEBS_CHUNKFILE_POOL_DIR       = "chunkfilepool"
 	LAYOUT_CURVEBS_COPYSETS_DIR             = "copysets"
 	LAYOUT_CURVEBS_RECYCLER_DIR             = "recycler"
 	LAYOUT_CURVEBS_TOOLS_CONFIG_SYSTEM_PATH = "/etc/curve/tools.conf"
 	LAYOUT_CURVEFS_TOOLS_CONFIG_SYSTEM_PATH = "/etc/curvefs/tools.conf"
+	LAYOUT_CURVE_TOOLSV2_CONFIG_SYSTEM_PATH = "/etc/curve/curve.yaml"
 	LAYOUT_CORE_SYSTEM_DIR                  = "/core"
 
 	BINARY_CURVEBS_TOOL     = "curvebs-tool"
 	BINARY_CURVEBS_FORMAT   = "curve_format"
 	BINARY_CURVEFS_TOOL     = "curvefs_tool"
+	BINARY_CURVE_TOOL_V2    = "curve"
 	METAFILE_CHUNKFILE_POOL = "chunkfilepool.meta"
 	METAFILE_CHUNKSERVER_ID = "chunkserver.dat"
 )
@@ -223,6 +226,11 @@ type (
 		ToolsConfSystemPath string // /etc/curve/tools.conf
 		ToolsBinaryPath     string // /curvebs/tools/sbin/curvebs-tool
 
+		// toolsv2
+		ToolsV2ConfSrcPath    string // /curvebs/conf/curve.yaml
+		ToolsV2ConfSystemPath string // /etc/curve/curve.yaml
+		ToolsV2BinaryPath     string // /curvebs/tools-v2/sbin/curve
+
 		// format
 		FormatBinaryPath      string // /curvebs/tools/sbin/curve_format
 		ChunkfilePoolRootDir  string // /curvebs/chunkserver/data
@@ -262,6 +270,12 @@ func (dc *DeployConfig) GetProjectLayout() Layout {
 		LAYOUT_CURVEBS_TOOLS_CONFIG_SYSTEM_PATH,
 		LAYOUT_CURVEFS_TOOLS_CONFIG_SYSTEM_PATH)
 
+	// tools-v2
+	toolsV2RootDir := root + LAYOUT_TOOLS_V2_DIR
+	toolsV2BinDir := toolsV2RootDir + LAYOUT_SERVICE_BIN_DIR
+	toolsV2BinaryName := BINARY_CURVE_TOOL_V2
+	toolsV2ConfSystemPath := LAYOUT_CURVE_TOOLSV2_CONFIG_SYSTEM_PATH
+
 	// format
 	chunkserverDataDir := fmt.Sprintf("%s/%s%s", root, ROLE_CHUNKSERVER, LAYOUT_SERVICE_DATA_DIR)
 
@@ -292,6 +306,11 @@ func (dc *DeployConfig) GetProjectLayout() Layout {
 		ToolsConfSystemPath: toolsConfSystemPath,
 		ToolsBinaryPath:     fmt.Sprintf("%s/%s", toolsBinDir, toolsBinaryName),
 
+		// toolsv2
+		ToolsV2ConfSrcPath:    fmt.Sprintf("%s/curve.yaml", confSrcDir),
+		ToolsV2ConfSystemPath: toolsV2ConfSystemPath,
+		ToolsV2BinaryPath:     fmt.Sprintf("%s/%s", toolsV2BinDir, toolsV2BinaryName),
+
 		// format
 		FormatBinaryPath:      fmt.Sprintf("%s/%s", toolsBinDir, BINARY_CURVEBS_FORMAT),
 		ChunkfilePoolRootDir:  chunkserverDataDir,

internal/task/step/file.go

@@ -79,6 +79,16 @@ type (
 		module.ExecOptions
 	}
 
+	TrySyncFile struct {
+		ContainerSrcId    *string
+		ContainerSrcPath  string
+		ContainerDestId   *string
+		ContainerDestPath string
+		KVFieldSplit      string
+		Mutate            func(string, string, string) (string, error)
+		module.ExecOptions
+	}
+
 	DownloadFile struct {
 		RemotePath string
 		LocalPath  string
@@ -244,3 +254,27 @@ func (s *SyncFile) Execute(ctx *context.Context) error {
 func (s *DownloadFile) Execute(ctx *context.Context) error {
 	return ctx.Module().File().Download(s.RemotePath, s.LocalPath)
 }
+
+func (s *TrySyncFile) Execute(ctx *context.Context) error {
+	var input string
+	step := &ReadFile{
+		ContainerId:      *s.ContainerSrcId,
+		ContainerSrcPath: s.ContainerSrcPath,
+		Content:          &input,
+		ExecOptions:      s.ExecOptions,
+	}
+	if err := step.Execute(ctx); err != nil {
+		// no this file
+		return nil
+	}
+	sync := SyncFile{
+		ContainerSrcId:    s.ContainerSrcId,
+		ContainerSrcPath:  s.ContainerSrcPath,
+		ContainerDestId:   s.ContainerDestId,
+		ContainerDestPath: s.ContainerDestPath,
+		KVFieldSplit:      s.KVFieldSplit,
+		Mutate:            s.Mutate,
+		ExecOptions:       s.ExecOptions,
+	}
+	return sync.Execute(ctx)
+}

internal/task/task/bs/map.go

@@ -36,6 +36,12 @@ import (
 	"github.com/opencurve/curveadm/internal/task/task"
 )
 
+const (
+	TOOLSV2_CONFIG_DELIMITER = ":"
+	TOOLSV2_CONFIG_SRC_PATH  = "/curvebs/conf/curve.yaml"
+	TOOLSV2_CONFIG_DEST_PATH = "/etc/curve/curve.yaml"
+)
+
 type (
 	MapOptions struct {
 		Host        string
@@ -115,6 +121,15 @@ func NewMapTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig) (*task.Task,
 		ContainerDestPath: scriptPath,
 		ExecOptions:       curveadm.ExecOptions(),
 	})
+	t.AddStep(&step.TrySyncFile{ // sync toolsv2 config
+		ContainerSrcId:    &containerId,
+		ContainerSrcPath:  TOOLSV2_CONFIG_SRC_PATH,
+		ContainerDestId:   &containerId,
+		ContainerDestPath: TOOLSV2_CONFIG_DEST_PATH,
+		KVFieldSplit:      TOOLSV2_CONFIG_DELIMITER,
+		Mutate:            newToolsV2Mutate(cc, TOOLSV2_CONFIG_DELIMITER),
+		ExecOptions:       curveadm.ExecOptions(),
+	})
 	t.AddStep(&step.ContainerExec{
 		ContainerId: &containerId,
 		Command:     command,
@@ -128,3 +143,26 @@ func NewMapTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig) (*task.Task,
 
 	return t, nil
 }
+
+func newToolsV2Mutate(cc *configure.ClientConfig, delimiter string) step.Mutate {
+	clientConfig := cc.GetServiceConfig()
+	tools2client := map[string]string{
+		"mdsAddr": "mdsOpt.rpcRetryOpt.addrs",
+	}
+	return func(in, key, value string) (out string, err error) {
+		if len(key) == 0 {
+			out = in
+			return
+		}
+		replaceKey := strings.TrimSpace(key)
+		if tools2client[strings.TrimSpace(key)] != "" {
+			replaceKey = tools2client[strings.TrimSpace(key)]
+		}
+		v, ok := clientConfig[strings.ToLower(replaceKey)]
+		if ok {
+			value = v
+		}
+		out = fmt.Sprintf("%s%s %s", key, delimiter, value)
+		return
+	}
+}

internal/task/task/common/sync_config.go

@@ -37,8 +37,9 @@ import (
 )
 
 const (
-	DEFAULT_CONFIG_DELIMITER = "="
-	ETCD_CONFIG_DELIMITER    = ": "
+	DEFAULT_CONFIG_DELIMITER  = "="
+	ETCD_CONFIG_DELIMITER     = ": "
+	TOOLS_V2_CONFIG_DELIMITER = ":"
 
 	CURVE_CRONTAB_FILE = "/tmp/curve_crontab"
 )
@@ -71,6 +72,34 @@ func newMutate(dc *topology.DeployConfig, delimiter string, forceRender bool) st
 	}
 }
 
+func newToolV2Mutate(dc *topology.DeployConfig, delimiter string, forceRender bool) step.Mutate {
+	serviceConfig := dc.GetServiceConfig()
+	return func(in, key, value string) (out string, err error) {
+		if len(key) == 0 {
+			out = in
+			if forceRender { // only for nginx.conf
+				out, err = dc.GetVariables().Rendering(in)
+			}
+			return
+		}
+
+		// replace config
+		v, ok := serviceConfig[strings.ToLower(key)]
+		if ok {
+			value = v
+		}
+
+		// replace variable
+		value, err = dc.GetVariables().Rendering(value)
+		if err != nil {
+			return
+		}
+
+		out = fmt.Sprintf("%s%s %s", key, delimiter, value)
+		return
+	}
+}
+
 func newCrontab(uuid string, dc *topology.DeployConfig, reportScriptPath string) string {
 	var period, command string
 	if dc.GetReportUsage() == true {
@@ -146,6 +175,15 @@ func NewSyncConfigTask(curveadm *cli.CurveAdm, dc *topology.DeployConfig) (*task
 		Mutate:            newMutate(dc, DEFAULT_CONFIG_DELIMITER, false),
 		ExecOptions:       curveadm.ExecOptions(),
 	})
+	t.AddStep(&step.TrySyncFile{ // sync toolsv2 config
+		ContainerSrcId:    &containerId,
+		ContainerSrcPath:  layout.ToolsV2ConfSrcPath,
+		ContainerDestId:   &containerId,
+		ContainerDestPath: layout.ToolsV2ConfSystemPath,
+		KVFieldSplit:      TOOLS_V2_CONFIG_DELIMITER,
+		Mutate:            newToolV2Mutate(dc, TOOLS_V2_CONFIG_DELIMITER, false),
+		ExecOptions:       curveadm.ExecOptions(),
+	})
 	t.AddStep(&step.InstallFile{ // install report script
 		ContainerId:       &containerId,
 		ContainerDestPath: reportScriptPath,

internal/task/task/fs/mount.go

@@ -45,6 +45,7 @@ const (
 	FORMAT_MOUNT_OPTION = "type=bind,source=%s,target=%s,bind-propagation=rshared"
 
 	CLIENT_CONFIG_DELIMITER = "="
+	TOOLSV2_CONFIG_DELIMITER = ":"
 
 	KEY_CURVEBS_CLUSTER = "curvebs.cluster"
 
@@ -212,6 +213,29 @@ func newToolsMutate(cc *configure.ClientConfig, delimiter string) step.Mutate {
 	}
 }
 
+func newToolsV2Mutate(cc *configure.ClientConfig, delimiter string) step.Mutate {
+	clientConfig := cc.GetServiceConfig()
+	tools2client := map[string]string{
+		"mdsAddr":       "mdsOpt.rpcRetryOpt.addrs",
+	}
+	return func(in, key, value string) (out string, err error) {
+		if len(key) == 0 {
+			out = in
+			return
+		}
+		replaceKey := strings.TrimSpace(key)
+		if tools2client[strings.TrimSpace(key)] != "" {
+			replaceKey = tools2client[strings.TrimSpace(key)]
+		}
+		v, ok := clientConfig[strings.ToLower(replaceKey)]
+		if ok {
+			value = v
+		}
+		out = fmt.Sprintf("%s%s %s", key, delimiter, value)
+		return
+	}
+}
+
 func mountPoint2ContainerName(mountPoint string) string {
 	return fmt.Sprintf("curvefs-filesystem-%s", utils.MD5Sum(mountPoint))
 }
@@ -372,6 +396,15 @@ func NewMountFSTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig) (*task.T
 		Mutate:            newToolsMutate(cc, CLIENT_CONFIG_DELIMITER),
 		ExecOptions:       curveadm.ExecOptions(),
 	})
+	t.AddStep(&step.TrySyncFile{ // sync toolsv2 config
+		ContainerSrcId:    &containerId,
+		ContainerSrcPath:  fmt.Sprintf("%s/conf/curve.yaml", root),
+		ContainerDestId:   &containerId,
+		ContainerDestPath: topology.GetCurveFSProjectLayout().ToolsV2ConfSystemPath,
+		KVFieldSplit:      TOOLSV2_CONFIG_DELIMITER,
+		Mutate:            newToolsV2Mutate(cc, TOOLSV2_CONFIG_DELIMITER),
+		ExecOptions:       curveadm.ExecOptions(),
+	})
 	t.AddStep(&step.InstallFile{ // install client.sh shell
 		ContainerId:       &containerId,
 		ContainerDestPath: createfsScriptPath,