[.dingoadm] set .dingoadm as the default command home directory

Author: jackblack369

README.md

@@ -31,5 +31,5 @@ License
 
 CurveAdm is under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details.
 
-[docs]: https://github.com/dingodb/curveadm/wiki
-[contributing]: https://github.com/dingodb/curveadm/wiki/others#参与-curveadm-的开发
+[docs]: https://github.com/dingodb/dingoadm/wiki
+[contributing]: https://github.com/dingodb/dingoadm/wiki/others#参与-dingoadm-的开发

cli/cli/cli.go

@@ -73,10 +73,10 @@ type CurveAdm struct {
 }
 
 /*
- * $HOME/.curveadm
- *   - curveadm.cfg
+ * $HOME/.dingoadm
+ *   - dingoadm.cfg
  *   - /bin/dingoadm
- *   - /data/curveadm.db
+ *   - /data/dingoadm.db
  *   - /plugins/{shell,file,polarfs}
  *   - /logs/2006-01-02_15-04-05.log
  *   - /temp/
@@ -87,7 +87,7 @@ func NewCurveAdm() (*CurveAdm, error) {
 		return nil, errno.ERR_GET_USER_HOME_DIR_FAILED.E(err)
 	}
 
-	rootDir := fmt.Sprintf("%s/.curveadm", home)
+	rootDir := fmt.Sprintf("%s/.dingoadm", home)
 	curveadm := &CurveAdm{
 		rootDir:   rootDir,
 		dataDir:   path.Join(rootDir, "data"),
@@ -120,8 +120,8 @@ func (curveadm *CurveAdm) init() error {
 		}
 	}
 
-	// (2) Parse curveadm.cfg
-	confpath := fmt.Sprintf("%s/curveadm.cfg", curveadm.rootDir)
+	// (2) Parse dingoadm.cfg
+	confpath := fmt.Sprintf("%s/dingoadm.cfg", curveadm.rootDir)
 	config, err := configure.ParseCurveAdmConfig(confpath)
 	if err != nil {
 		return err
@@ -130,7 +130,7 @@ func (curveadm *CurveAdm) init() error {
 
 	// (3) Init logger
 	now := time.Now().Format("2006-01-02_15-04-05")
-	logpath := fmt.Sprintf("%s/curveadm-%s.log", curveadm.logDir, now)
+	logpath := fmt.Sprintf("%s/dingoadm-%s.log", curveadm.logDir, now)
 	if err := log.Init(config.GetLogLevel(), logpath); err != nil {
 		return errno.ERR_INIT_LOGGER_FAILED.E(err)
 	} else {
@@ -422,7 +422,7 @@ func (curveadm *CurveAdm) CheckRole(role string) error {
 
 	kind := dcs[0].GetKind()
 	roles := topology.CURVEBS_ROLES
-	if kind == topology.KIND_CURVEFS {
+	if kind == topology.KIND_CURVEFS || kind == topology.KIND_DINGOFS {
 		roles = topology.CURVEFS_ROLES
 	}
 	supported := utils.Slice2Map(roles)

cli/command/client/enter.go

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

cli/command/client/install.go

@@ -50,7 +50,7 @@ type installOptions struct {
 
 func checkInstallOptions(curveadm *cli.CurveAdm, options installOptions) error {
 	kind := options.kind
-	if kind != topology.KIND_CURVEBS && kind != topology.KIND_CURVEFS {
+	if kind != topology.KIND_CURVEBS && kind != topology.KIND_CURVEFS && kind != topology.KIND_DINGOFS {
 		return errno.ERR_UNSUPPORT_CLIENT_KIND.F("kind: %s", kind)
 	} else if !utils.PathExist(options.filename) {
 		return errno.ERR_CLIENT_CONFIGURE_FILE_NOT_EXIST.

cli/command/client/uninstall.go

@@ -47,7 +47,7 @@ type uninstallOptions struct {
 
 func checkUninstallOptions(curveadm *cli.CurveAdm, options uninstallOptions) error {
 	kind := options.kind
-	if kind != topology.KIND_CURVEBS && kind != topology.KIND_CURVEFS {
+	if kind != topology.KIND_CURVEBS && kind != topology.KIND_CURVEFS && kind != topology.KIND_DINGOFS {
 		return errno.ERR_UNSUPPORT_CLIENT_KIND.
 			F("kind: %s", kind)
 	}

internal/configure/client.go

@@ -122,7 +122,7 @@ func NewClientConfig(config map[string]interface{}) (*ClientConfig, error) {
 	kind := cc.GetKind()
 	field := utils.Choose(kind == topology.KIND_CURVEBS,
 		KEY_CURVEBS_LISTEN_MDS_ADDRS, KEY_CURVEFS_LISTEN_MDS_ADDRS)
-	if cc.GetKind() != topology.KIND_CURVEBS && kind != topology.KIND_CURVEFS {
+	if cc.GetKind() != topology.KIND_CURVEBS && kind != topology.KIND_CURVEFS && kind != topology.KIND_DINGOFS {
 		return nil, errno.ERR_UNSUPPORT_CLIENT_CONFIGURE_KIND.
 			F("kind: %s", kind)
 	} else if len(cc.GetClusterMDSAddr()) == 0 {

internal/configure/pool.go

@@ -32,6 +32,7 @@ import (
 const (
 	KIND_CURVEBS     = topology.KIND_CURVEBS
 	KIND_CURVEFS     = topology.KIND_CURVEFS
+	KIND_DINGOFS     = topology.KIND_DINGOFS
 	ROLE_CHUNKSERVER = topology.ROLE_CHUNKSERVER
 	ROLE_METASERVER  = topology.ROLE_METASERVER
 
@@ -163,7 +164,8 @@ func createLogicalPool(dcs []*topology.DeployConfig, logicalPool, poolset string
 	for _, dc := range dcs {
 		role := dc.GetRole()
 		if (role == ROLE_CHUNKSERVER && kind == KIND_CURVEBS) ||
-			(role == ROLE_METASERVER && kind == KIND_CURVEFS) {
+			(role == ROLE_METASERVER && kind == KIND_CURVEFS) ||
+			(role == ROLE_METASERVER && kind == KIND_DINGOFS) {
 			if dc.GetParentId() == dc.GetId() {
 				zone = nextZone()
 			}

internal/configure/topology/topology.go

@@ -115,11 +115,12 @@ func ParseTopology(data string, ctx *Context) ([]*DeployConfig, error) {
 	// check topology kind
 	kind := topology.Kind
 	roles := []string{}
-	if kind == KIND_CURVEBS {
+	switch kind {
+	case KIND_CURVEBS:
 		roles = append(roles, CURVEBS_ROLES...)
-	} else if kind == KIND_CURVEFS {
+	case KIND_CURVEFS, KIND_DINGOFS:
 		roles = append(roles, CURVEFS_ROLES...)
-	} else {
+	default:
 		return nil, errno.ERR_UNSUPPORT_CLUSTER_KIND
 	}
 

internal/configure/topology/variables.go

@@ -122,7 +122,7 @@ var (
 		{name: "cluster_snapshotclone_proxy_addr", kind: []string{KIND_CURVEBS}},
 		{name: "cluster_snapshotclone_dummy_port", kind: []string{KIND_CURVEBS}},
 		{name: "cluster_snapshotclone_nginx_upstream", kind: []string{KIND_CURVEBS}},
-		{name: "cluster_metaserver_addr", kind: []string{KIND_CURVEFS}},
+		{name: "cluster_metaserver_addr", kind: []string{KIND_CURVEFS, KIND_DINGOFS}},
 	}
 )
 

internal/task/task/checker/topology.go

@@ -181,7 +181,7 @@ func (s *step2CheckServices) getHostNum(dcs []*topology.DeployConfig) int {
 func (s *step2CheckServices) skip(role string) bool {
 	kind := s.dcs[0].GetKind()
 	// KIND_CURVEFS
-	if kind == topology.KIND_CURVEFS {
+	if kind == topology.KIND_CURVEFS || kind == topology.KIND_DINGOFS {
 		if role == ROLE_CHUNKSERVER || role == ROLE_SNAPSHOTCLONE {
 			return true
 		}