[root dir] update dingofs as Bootstrap server's root directory

Author: jackblack369

cli/command/client/enter.go

@@ -65,7 +65,7 @@ func runEnter(curveadm *cli.CurveAdm, options enterOptions) error {
 	client := clients[0]
 	home := "/curvebs/nebd"
 	if client.Kind == topology.KIND_CURVEFS || client.Kind == topology.KIND_DINGOFS {
-		home = "/curvefs/client"
+		home = "/dingofs/client"
 	}
 	return tools.AttachRemoteContainer(curveadm, client.Host, client.ContainerId, home)
 }

cli/command/deploy.go

@@ -228,7 +228,7 @@ func genDeployPlaybook(curveadm *cli.CurveAdm,
 	} else {
 		steps = CURVEFS_DEPLOY_STEPS
 		if options.useLocalImage {
-			// remote PULL_IMAGE step
+			// remove PULL_IMAGE step
 			for i, item := range steps {
 				if item == PULL_IMAGE {
 					steps = append(steps[:i], steps[i+1:]...)

cli/command/playground/run.go

@@ -110,7 +110,7 @@ func NewRunCommand(curveadm *cli.CurveAdm) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&options.kind, "kind", "k", "curvefs", "Specify the type of playground (curvebs/curvefs)")
+	flags.StringVarP(&options.kind, "kind", "k", "curvefs", "Specify the type of playground (curvefs/dingofs)")
 	flags.StringVar(&options.mountPoint, "mountpoint", "p", "Specify the mountpoint for CurveFS playground")
 	flags.StringVarP(&options.containerImage, "container_image", "i", "opencurvedocker/curvebs:playground", "Specify the playground container image")
 

internal/configure/topology/dc_get.go

@@ -34,6 +34,7 @@ import (
 
 const (
 	// service project layout
+	LAYOUT_DINGOFS_ROOT_DIR                  = "/dingofs"
 	LAYOUT_CURVEFS_ROOT_DIR                  = "/curvefs"
 	LAYOUT_CURVEBS_ROOT_DIR                  = "/curvebs"
 	LAYOUT_PLAYGROUND_ROOT_DIR               = "playground"
@@ -48,13 +49,13 @@ const (
 	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_CURVEFS_TOOLS_CONFIG_SYSTEM_PATH  = "/etc/curvefs/tools.conf" // TODO: keep tools config path
 	LAYOUT_CURVE_TOOLS_V2_CONFIG_SYSTEM_PATH = "/etc/dingo/dingo.yaml"
 	LAYOUT_CORE_SYSTEM_DIR                   = "/core"
 
 	BINARY_CURVEBS_TOOL     = "curvebs-tool"
 	BINARY_CURVEBS_FORMAT   = "curve_format"
-	BINARY_CURVEFS_TOOL     = "curvefs_tool"
+	BINARY_CURVEFS_TOOL     = "dingo-tool"
 	BINARY_CURVE_TOOL_V2    = "curve"
 	METAFILE_CHUNKFILE_POOL = "chunkfilepool.meta"
 	METAFILE_CHUNKSERVER_ID = "chunkserver.dat"
@@ -229,7 +230,7 @@ type (
 		ToolsBinaryPath     string // /curvebs/tools/sbin/curvebs-tool
 
 		// tools-v2
-		ToolsV2ConfSrcPath    string // /curvefs/conf/dingo.yaml
+		ToolsV2ConfSrcPath    string // /dingofs/conf/dingo.yaml
 		ToolsV2ConfSystemPath string // /etc/dingo/dingo.yaml
 		ToolsV2BinaryPath     string // /curvebs/tools-v2/sbin/curve
 
@@ -248,7 +249,8 @@ func (dc *DeployConfig) GetProjectLayout() Layout {
 	kind := dc.GetKind()
 	role := dc.GetRole()
 	// project
-	root := utils.Choose(kind == KIND_CURVEBS, LAYOUT_CURVEBS_ROOT_DIR, LAYOUT_CURVEFS_ROOT_DIR)
+	curve_root := LAYOUT_CURVEFS_ROOT_DIR
+	root := utils.Choose(kind == KIND_CURVEBS, LAYOUT_CURVEBS_ROOT_DIR, LAYOUT_DINGOFS_ROOT_DIR)
 
 	// service
 	confSrcDir := root + LAYOUT_CONF_SRC_DIR
@@ -263,8 +265,8 @@ func (dc *DeployConfig) GetProjectLayout() Layout {
 		})
 	}
 
-	// tools
-	toolsRootDir := root + LAYOUT_TOOLS_DIR
+	// tools, keep 'curvefs' as root dir
+	toolsRootDir := curve_root + LAYOUT_TOOLS_DIR
 	toolsBinDir := toolsRootDir + LAYOUT_SERVICE_BIN_DIR
 	toolsConfDir := toolsRootDir + LAYOUT_SERVICE_CONF_DIR
 	toolsBinaryName := utils.Choose(kind == KIND_CURVEBS, BINARY_CURVEBS_TOOL, BINARY_CURVEFS_TOOL)

internal/configure/topology/dc_item.go

@@ -86,7 +86,7 @@ var (
 			if dc.GetKind() == KIND_CURVEBS {
 				return path.Join(LAYOUT_CURVEBS_ROOT_DIR, dc.GetRole())
 			}
-			return path.Join(LAYOUT_CURVEFS_ROOT_DIR, dc.GetRole())
+			return path.Join(LAYOUT_DINGOFS_ROOT_DIR, dc.GetRole())
 		},
 	)
 

internal/task/task/common/collect_client.go

@@ -24,9 +24,10 @@ package common
 
 import (
 	"fmt"
-	"github.com/dingodb/curveadm/internal/configure/topology"
 	"path"
 
+	"github.com/dingodb/curveadm/internal/configure/topology"
+
 	"github.com/dingodb/curveadm/cli/cli"
 	comm "github.com/dingodb/curveadm/internal/common"
 	"github.com/dingodb/curveadm/internal/storage"
@@ -62,9 +63,9 @@ func NewCollectClientTask(curveadm *cli.CurveAdm, v interface{}) (*task.Task, er
 	localEncryptdTarballPath := path.Join(baseDir, vname.EncryptCompressName) // // /tmp/7b510fb63730_ox1fe-encrypted.tar.gz
 	httpSavePath := path.Join("/", encodeSecret(secret), "client")            // /34701feb224479a20a5090510f648037/client
 	containerLogDir := utils.Choose(client.Kind == topology.KIND_CURVEBS,
-		"/curvebs/nebd/logs", "/curvefs/client/logs")
+		"/curvebs/nebd/logs", "/dingofs/client/logs")
 	containerConfDir := utils.Choose(client.Kind == topology.KIND_CURVEBS,
-		"/curvebs/nebd/conf", "/curvefs/client/conf")
+		"/curvebs/nebd/conf", "/dingofs/client/conf")
 	localOptions := curveadm.ExecOptions()
 	localOptions.ExecInLocal = true
 	t.AddStep(&step.CreateDirectory{

internal/task/task/playground/create.go

@@ -55,7 +55,7 @@ func getAttchMount(kind, mountPoint string) string {
 	if kind == topology.KIND_CURVEBS {
 		return mount
 	}
-	return fmt.Sprintf(FORMAT_MOUNT_OPTION, mountPoint, "/curvefs/client/mnt")
+	return fmt.Sprintf(FORMAT_MOUNT_OPTION, mountPoint, "/dingofs/client/mnt")
 }
 
 func getMountVolumes(kind string) []step.Volume {