[dingofs] support only mds services

jackblack369 · jackblack369 · commit a28798066b08 · 2025-10-29T23:42:54.000+08:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -17,13 +17,13 @@
             },
             "args": [
                 "deploy",
-                "-k",
-                "--local"
+                // "-k",
+                // "--local"
             ],
             "showLog": true,
             //"preLaunchTask": "enable-gcc-toolset"
         },
-                {
+        {
             "name": "dingoadm deploy dingo-store",
             "type": "go",
             "request": "launch",
@@ -41,6 +41,24 @@
             ],
             "showLog": true,
         },
+        {
+            "name": "dingoadm deploy mdsv2 only",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/dingoadm/main.go",
+            "env": {
+                "CGO_ENABLED": "1",
+                "PATH": "/opt/rh/gcc-toolset-13/root/usr/bin:${env:PATH}",
+                "dingo_cluster": "mdsv2-only"
+            },
+            "args": [
+                "deploy",
+                "-k",
+                "--local"
+            ],
+            "showLog": true,
+        },
         {
             "name": "dingoadm -u",
             "type": "go",
@@ -173,6 +191,24 @@
             ],
             "showLog": true,
         },
+        {
+            "name": "dingoadm cluster add mdsv2 only",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/dingoadm/main.go",
+            "env": {
+                "CGO_ENABLED": "1",
+                "PATH": "/opt/rh/gcc-toolset-13/root/usr/bin:${env:PATH}"
+            },
+            "args": [
+                "cluster",
+                "add",
+                "mdsv2-only",
+                "-f=/home/dongwei/deploy/dingofs/topology-mdsv2-only.yaml",
+            ],
+            "showLog": true,
+        },
         {
             "name": "dingoadm cluster checkout",
             "type": "go",
@@ -324,7 +360,23 @@
             "args": [
                 "config",
                 "commit",
-                "/home/dongwei/deploy/dingofs/topology-mdsv2-v6-sync-java-opts.sh"
+                "/home/dongwei/deploy/dingofs/topology-mdsv2-v6-sync-java-opts.yaml"
+            ],
+            "showLog": true
+        },
+        {
+            "name": "dingoadm config commit mdsv2-only",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/dingoadm/main.go",
+            "env": {
+                "dingo_cluster": "mdsv2-only"
+            },
+            "args": [
+                "config",
+                "commit",
+                "/home/dongwei/deploy/dingofs/topology-mdsv2-only.yaml"
             ],
             "showLog": true
         },
diff --git a/cli/command/cluster/add.go b/cli/command/cluster/add.go
@@ -106,16 +106,7 @@ func genCheckTopologyPlaybook(dingoadm *cli.DingoAdm,
 	kind := dcs[0].GetKind()
 	roles := dingoadm.GetRoles(dcs)
 
-	var skipRoles []string
-	if kind == topology.KIND_DINGOFS {
-		if kind == topology.KIND_DINGOFS {
-			if !utils.Contains(roles, topology.ROLE_COORDINATOR) {
-				skipRoles = append(skipRoles, topology.ROLE_COORDINATOR, topology.ROLE_STORE, topology.ROLE_MDS_V2)
-			} else {
-				skipRoles = append(skipRoles, topology.ROLE_ETCD, topology.ROLE_METASERVER, topology.ROLE_MDS_V2)
-			}
-		}
-	}
+	skipRoles := topology.FetchSkipRoles(kind, dcs, roles)
 	pb := playbook.NewPlaybook(dingoadm)
 	for _, step := range steps {
 		pb.AddStep(&playbook.PlaybookStep{
diff --git a/cli/command/config/commit.go b/cli/command/config/commit.go
@@ -120,15 +120,7 @@ func genCheckTopologyPlaybook(dingoadm *cli.DingoAdm,
 	kind := dcs[0].GetKind()
 	roles := dingoadm.GetRoles(dcs)
 
-	var skipRoles []string
-	if kind == topology.KIND_DINGOFS {
-		if !utils.Contains(roles, topology.ROLE_COORDINATOR) {
-			skipRoles = append(skipRoles, topology.ROLE_COORDINATOR, topology.ROLE_STORE, topology.ROLE_MDS_V2)
-		} else {
-			skipRoles = append(skipRoles, topology.ROLE_ETCD, topology.ROLE_METASERVER, topology.ROLE_MDS_V2)
-		}
-	}
-
+	skipRoles := topology.FetchSkipRoles(kind, dcs, roles)
 	for _, step := range steps {
 		pb.AddStep(&playbook.PlaybookStep{
 			Type:    step,
diff --git a/cli/command/deploy.go b/cli/command/deploy.go
@@ -121,8 +121,10 @@ var (
 		CLEAN_PRECHECK_ENVIRONMENT,
 		PULL_IMAGE,
 		CREATE_CONTAINER,
-		// SYNC_MDSV2_CONFIG
-		// CREATE_META_TABLES,
+		CREATE_MDSV2_CLI_CONTAINER,
+		SYNC_CONFIG,
+		START_MDSV2_CLI_CONTAINER,
+		CREATE_META_TABLES,
 		START_MDSV2,
 	}
 
@@ -329,17 +331,14 @@ func genDeployPlaybook(dingoadm *cli.DingoAdm,
 	switch kind {
 	case topology.KIND_DINGOFS:
 		if utils.Contains(roles, topology.ROLE_COORDINATOR) {
-			if len(roles) == 1 {
-				// only mds v2, no coordinator/store
-				steps = DINGOFS_MDSV2_ONLY_DEPLOY_STEPS
-			} else {
-				// mds v2 with coordinator/store
-				steps = DINGOFS_MDSV2_FOLLOW_DEPLOY_STEPS
-				if !utils.Contains(roles, topology.ROLE_DINGODB_EXECUTOR) {
-					// remove executor reference step which is the last step
-					steps = steps[:len(steps)-1]
-				}
+			// mds v2 with coordinator/store
+			steps = DINGOFS_MDSV2_FOLLOW_DEPLOY_STEPS
+			if !utils.Contains(roles, topology.ROLE_DINGODB_EXECUTOR) {
+				// remove executor reference step which is the last step
+				steps = steps[:len(steps)-1]
 			}
+		} else if utils.ContainsList(roles, []string{topology.ROLE_MDS_V2, topology.ROLE_MDSV2_CLI}) {
+			steps = DINGOFS_MDSV2_ONLY_DEPLOY_STEPS
 		} else if !utils.Contains(roles, topology.ROLE_METASERVER) {
 			steps = DINGOFS_MDS_DEPLOY_STEPS
 		} else {
diff --git a/cli/command/precheck.go b/cli/command/precheck.go
@@ -59,22 +59,6 @@ const (
 )
 
 var (
-	CURVEBS_PRECHECK_STEPS = []int{
-		playbook.CHECK_TOPOLOGY,             // topology
-		playbook.CHECK_SSH_CONNECT,          // ssh
-		playbook.CHECK_PERMISSION,           // permission
-		playbook.CHECK_KERNEL_VERSION,       // kernel
-		playbook.CLEAN_PRECHECK_ENVIRONMENT, // <none>
-		playbook.CHECK_PORT_IN_USE,          // network
-		playbook.CHECK_DESTINATION_REACHABLE,
-		playbook.START_HTTP_SERVER,
-		playbook.CHECK_NETWORK_FIREWALL,
-		playbook.GET_HOST_DATE, // date
-		playbook.CHECK_HOST_DATE,
-		playbook.CHECK_CHUNKFILE_POOL, // service
-		//playbook.CHECK_S3,
-	}
-
 	DINGOFS_PRECHECK_STEPS = []int{
 		playbook.CHECK_TOPOLOGY,             // topology
 		playbook.CHECK_SSH_CONNECT,          // ssh
@@ -188,17 +172,9 @@ func genPrecheckPlaybook(dingoadm *cli.DingoAdm,
 	options precheckOptions) (*playbook.Playbook, error) {
 	kind := dcs[0].GetKind()
 	steps := DINGOFS_PRECHECK_STEPS
-	if kind == topology.KIND_CURVEBS {
-		steps = CURVEBS_PRECHECK_STEPS
-	}
 
 	roles := dingoadm.GetRoles(dcs)
-	var skipRoles []string
-	if kind == topology.KIND_DINGOFS {
-		if !utils.Contains(roles, topology.ROLE_MDS_V2) {
-			skipRoles = append(skipRoles, topology.ROLE_COORDINATOR, topology.ROLE_STORE, topology.ROLE_MDS_V2)
-		}
-	}
+	skipRoles := topology.FetchSkipRoles(kind, dcs, roles)
 
 	steps = skipPrecheckSteps(steps, options)
 
diff --git a/cli/command/scale_out.go b/cli/command/scale_out.go
@@ -229,11 +229,8 @@ func checkScaleOutTopology(curveadm *cli.DingoAdm, data string) error {
 
 func genScaleOutPrecheckPlaybook(curveadm *cli.DingoAdm, data string) (*playbook.Playbook, error) {
 	dcsAll, _ := curveadm.ParseTopologyData(data)
-	kind := dcsAll[0].GetKind()
+	// kind := dcsAll[0].GetKind()
 	steps := DINGOFS_PRECHECK_STEPS
-	if kind == topology.KIND_CURVEBS {
-		steps = CURVEBS_PRECHECK_STEPS
-	}
 	diffs, _ := diffTopology(curveadm, data)
 	dcs2scaleOut := diffs[topology.DIFF_ADD]
 
diff --git a/cli/command/status.go b/cli/command/status.go
@@ -156,11 +156,16 @@ func displayStatus(dingoadm *cli.DingoAdm, dcs []*topology.DeployConfig, options
 	excludeCols := []string{}
 	roles := dingoadm.GetRoles(dcs)
 	isMdsv2 := dcs[0].GetCtx().Lookup(topology.CTX_KEY_MDS_VERSION) == topology.CTX_VAL_MDS_V2
+	isMdsv2Only := false
+	if utils.ContainsList(roles, []string{topology.ROLE_MDS_V2, topology.ROLE_MDSV2_CLI}) && len(roles) == 2 {
+		isMdsv2Only = true
+		excludeCols = append(excludeCols, "Data Dir")
+	}
 
 	output := ""
 	width := 0
 	if len(options.dir) == 0 {
-		output, width = tui.FormatStatus(dcs[0].GetKind(), statuses, options.verbose, options.showInstances, excludeCols, isMdsv2)
+		output, width = tui.FormatStatus(dcs[0].GetKind(), statuses, options.verbose, options.showInstances, excludeCols, isMdsv2, isMdsv2Only)
 	} else {
 		dirStrs := strings.Split(options.dir, ",")
 		onlyDirs := []string{}
@@ -193,7 +198,7 @@ func displayStatus(dingoadm *cli.DingoAdm, dcs []*topology.DeployConfig, options
 			dingoadm.WriteOutln("cluster name     : %s", dingoadm.ClusterName())
 			dingoadm.WriteOutln("cluster kind     : %s", dcs[0].GetKind())
 			dingoadm.WriteOutln("mds     addr     : %s", getClusterMdsV2Addr(dcs))
-			if len(roles) == 1 {
+			if utils.ContainsList(roles, []string{topology.ROLE_MDS_V2, topology.ROLE_MDSV2_CLI}) {
 				dingoadm.WriteOutln("coordinator addr : %s", dcs[0].GetDingoStoreCoordinatorAddr())
 			} else {
 				dingoadm.WriteOutln("coordinator addr : %s", getClusterCoorAddr(dcs))
diff --git a/internal/configure/topology/dc.go b/internal/configure/topology/dc.go
@@ -80,6 +80,15 @@ const (
 	CTX_VAL_MDS_V2      = "v2"
 )
 
+var SKIP_ALL_ROLES = []string{
+	ROLE_COORDINATOR,
+	ROLE_STORE,
+	ROLE_MDS_V2,
+	ROLE_ETCD,
+	ROLE_METASERVER,
+	ROLE_DINGODB_EXECUTOR,
+}
+
 type (
 	DeployConfig struct {
 		kind              string // KIND_CURVEFS / KIND_CUVREBS
@@ -328,3 +337,17 @@ func (dc *DeployConfig) Build() error {
 	}
 	return dc.convert()
 }
+
+func FetchSkipRoles(kind string, dcs []*DeployConfig, roles []string) []string {
+	var skipRoles []string
+	if kind == KIND_DINGOFS {
+		if dcs[0].GetCtx().Lookup(CTX_KEY_MDS_VERSION) == CTX_VAL_MDS_V1 {
+			skipRoles = append(skipRoles, ROLE_COORDINATOR, ROLE_STORE, ROLE_MDS_V2)
+		} else if utils.Contains(roles, ROLE_COORDINATOR) {
+			skipRoles = append(skipRoles, ROLE_ETCD, ROLE_METASERVER, ROLE_MDS_V2)
+		} else {
+			skipRoles = SKIP_ALL_ROLES
+		}
+	}
+	return skipRoles
+}
diff --git a/internal/configure/topology/topology.go b/internal/configure/topology/topology.go
@@ -93,6 +93,7 @@ var (
 	}
 	DINGOFS_MDSV2_ONLY_ROLES = []string{
 		ROLE_MDS_V2,
+		ROLE_MDSV2_CLI,
 	}
 	DINGOFS_MDSV2_FOLLOW_ROLES = []string{
 		ROLE_MDS_V2,
@@ -167,6 +168,9 @@ func ParseTopology(data string, ctx *Context) ([]*DeployConfig, error) {
 				roles = append(roles, ROLE_DINGODB_EXECUTOR)
 				ctx.Add(CTX_KEY_MDS_VERSION, CTX_VAL_MDS_V2)
 			}
+		} else if topology.EtcdServices.Deploy == nil {
+			roles = append(roles, DINGOFS_MDSV2_ONLY_ROLES...)
+			ctx.Add(CTX_KEY_MDS_VERSION, CTX_VAL_MDS_V2)
 		} else {
 			roles = append(roles, DINGOFS_ROLES...)
 			ctx.Add(CTX_KEY_MDS_VERSION, CTX_VAL_MDS_V1)
@@ -211,7 +215,7 @@ func ParseTopology(data string, ctx *Context) ([]*DeployConfig, error) {
 		case ROLE_MDSV2_CLI:
 			// create tables role, only used to create meta tables
 			// just keep one deploy config
-			tmpDeploy := topology.CoordinatorServices.Deploy[0]
+			tmpDeploy := topology.MdsServices.Deploy[0]
 			tmpDeploy.Replicas = 0
 			services = Service{
 				Config: newIfNil(topology.MdsServices.Config),
diff --git a/internal/playbook/playbook.go b/internal/playbook/playbook.go
@@ -91,7 +91,7 @@ func (p *Playbook) run(steps []*PlaybookStep) error {
 		}
 
 		err = tasks.Execute(step.ExecOptions)
-		if err != nil {
+		if err != nil && step.Type != CHECK_PORT_IN_USE {
 			return err
 		}
 
diff --git a/internal/task/task/checker/common.go b/internal/task/task/checker/common.go
@@ -118,37 +118,6 @@ func getServiceListenAddresses(dc *topology.DeployConfig) []Address {
 			Port: dc.GetListenClientPort(),
 		})
 
-	case ROLE_CHUNKSERVER:
-		address = append(address, Address{
-			Role: ROLE_CHUNKSERVER,
-			IP:   dc.GetListenIp(),
-			Port: dc.GetListenPort(),
-		})
-		if dc.GetEnableExternalServer() {
-			address = append(address, Address{
-				Role: ROLE_CHUNKSERVER,
-				IP:   dc.GetListenExternalIp(),
-				Port: dc.GetListenExternalPort(),
-			})
-		}
-
-	case ROLE_SNAPSHOTCLONE:
-		address = append(address, Address{
-			Role: ROLE_SNAPSHOTCLONE,
-			IP:   dc.GetListenIp(),
-			Port: dc.GetListenPort(),
-		})
-		address = append(address, Address{
-			Role: ROLE_SNAPSHOTCLONE,
-			IP:   dc.GetListenIp(),
-			Port: dc.GetListenDummyPort(),
-		})
-		address = append(address, Address{
-			Role: ROLE_SNAPSHOTCLONE,
-			IP:   dc.GetListenIp(),
-			Port: dc.GetListenProxyPort(),
-		})
-
 	case ROLE_METASERVER:
 		address = append(address, Address{
 			Role: ROLE_METASERVER,
diff --git a/internal/task/task/checker/network.go b/internal/task/task/checker/network.go
@@ -134,7 +134,10 @@ func NewCheckPortInUseTask(dingoadm *cli.DingoAdm, dc *topology.DeployConfig) (*
 	if err != nil {
 		return nil, err
 	}
-
+	if dc.GetRole() == topology.ROLE_MDSV2_CLI || dc.GetRole() == topology.ROLE_DINGODB_EXECUTOR {
+		// no need to check port in use for mdsv2 cli
+		return nil, nil
+	}
 	addresses := getServiceListenAddresses(dc)
 	subname := fmt.Sprintf("host=%s role=%s ports={%s}",
 		dc.GetHost(), dc.GetRole(), joinPorts(dc, addresses))
diff --git a/internal/tui/service/status.go b/internal/tui/service/status.go
@@ -233,7 +233,7 @@ func mergeStatues(statuses []task.ServiceStatus) []task.ServiceStatus {
 	return ss
 }
 
-func FormatStatus(kind string, statuses []task.ServiceStatus, verbose, expand bool, excludeCols []string, isMdsv2 bool) (string, int) {
+func FormatStatus(kind string, statuses []task.ServiceStatus, verbose, expand bool, excludeCols []string, isMdsv2 bool, isMdsv2Only bool) (string, int) {
 	lines := [][]interface{}{}
 
 	// title
@@ -264,7 +264,9 @@ func FormatStatus(kind string, statuses []task.ServiceStatus, verbose, expand bo
 	}
 
 	if kind == topology.KIND_DINGOSTORE || isMdsv2 || kind == topology.KIND_DINGODB {
-		title = append(title, "Raft Dir")
+		if !isMdsv2Only {
+			title = append(title, "Raft Dir")
+		}
 	}
 	if kind == topology.KIND_DINGODB {
 		title = append(title, "Doc Dir", "Vector Dir")
diff --git a/internal/utils/common.go b/internal/utils/common.go

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func (p Playbook) run(steps []PlaybookStep) error {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`err = tasks.Execute(step.ExecOptions)`
`94`		`- if err != nil {`
	`94`	`+ if err != nil && step.Type != CHECK_PORT_IN_USE {`
`95`	`95`	`return err`
`96`	`96`	`}`
`97`	`97`