opencurve · Cyber-SiKu · May 8, 2023 · Apr 26, 2023
diff --git a/tools-v2/README.md b/tools-v2/README.md
@@ -54,9 +54,10 @@ A tool for CurveFS & CurveBs.
         - [query chunk](#query-chunk)
         - [query segment](#query-segment)
     - [status](#status-1)
-      - [staus etcd](#staus-etcd)
-      - [staus mds](#staus-mds)
+      - [status etcd](#status-etcd-1)
+      - [status mds](#status-mds-1)
       - [status client](#status-client)
+      - [status snapshotserver](#status-snapshotserver)
     - [delete](#delete-1)
       - [delete peer](#delete-peer)
     - [update](#update)
@@ -1011,7 +1012,7 @@ Output:
 
 ### status
 
-#### staus etcd
+#### status etcd
 
 get the etcd status of curvebs
 
@@ -1035,7 +1036,7 @@ Output:
 +---------------------+---------+----------+
 ```
 
-#### staus mds
+#### status mds
 
 get the mds status of curvebs
 
@@ -1059,6 +1060,7 @@ Output:
 +-------------------+-------------------+-------------------+----------+
 ```
 
+
 #### status client
 
 get the client status of curvebs
@@ -1081,6 +1083,31 @@ Output:
 +-------------+----------------+---------------------+-----+
 ```
 
+#### status snapshotserver
+
+get the mds status of curvebs
+
+Usage:
+
+```bash
+curve bs status snapshotserver
+```
+
+Output:
+
+```bash
++---------------------+---------------------+-------------------+----------+
+|        ADDR         |      DUMMYADDR      |    VERSION        |  STATUS  |
++---------------------+---------------------+-------------------+----------+
+| ***.***.**.***:**** | ***.***.**.***:**** | ci+562296c7+debug | follower |
++---------------------+---------------------+                   +          +
+| ***.***.**.***:**** | ***.***.**.***:**** |                   |          |
++---------------------+---------------------+                   +----------+
+| ***.***.**.***:**** | ***.***.**.***:**** |                   | leader   |
++---------------------+---------------------+-------------------+----------+
+```
+
+
 ### delete
 
 #### delete peer
@@ -1273,6 +1300,8 @@ Output:
 | status                           |                            |
 | chunkserver-status               |                            |
 | snapshot-clone-status            |                            |
+| client-status                    | curve bs status client     |
+| snapshot-clone-status            | curve bs status snapshotserver |
 | copysets-status                  |                            |
 | chunkserver-list                 |                            |
 | cluster-status                   |                            |

diff --git a/tools-v2/docs/zh/develop.md b/tools-v2/docs/zh/develop.md
@@ -386,7 +386,7 @@ docker cp ./sbin/curve de7603f17cf9:/
 4. 准备配置文件，将之拷贝进 playground 容器内：
 
 ```shell
-docker cp ./pkg/config/template.yaml de7603f17cf9:/etc/curve/curve.yaml
+docker cp ./pkg/config/curve.yaml de7603f17cf9:/etc/curve/curve.yaml
 ```
 
 5. 进入对应的容器：
@@ -558,10 +558,10 @@ curveadm status
 make
 ```
 
-3. 准备配置文件，将项目目录下的 `tools-v2/pkg/config/template.yaml` 复制到 `$(HOME)/.curve/curve.yaml`：
+3. 准备配置文件，将项目目录下的 `tools-v2/pkg/config/curve.yaml` 复制到 `$(HOME)/.curve/curve.yaml`：
 
 ```shell
-cp ./pkg/config/template.yaml ~/.curve/curve.yaml
+cp ./pkg/config/curve.yaml ~/.curve/curve.yaml
 ```
 
 4. 在项目目录（`curve/tools-v2`） 下执行命令/调试：

diff --git a/tools-v2/pkg/cli/command/curvebs/status/etcd/etcd.go b/tools-v2/pkg/cli/command/curvebs/status/etcd/etcd.go
@@ -68,12 +68,13 @@ func NewEtcdCommand() *cobra.Command {
 }
 
 func (eCmd *EtcdCommand) AddFlags() {
-	config.AddBsEtcdAddrFlag(eCmd.Cmd)
 	config.AddHttpTimeoutFlag(eCmd.Cmd)
+	config.AddBsEtcdAddrFlag(eCmd.Cmd)
 }
 
 func (eCmd *EtcdCommand) Init(cmd *cobra.Command, args []string) error {
 	eCmd.health = cobrautil.HEALTH_ERROR
+
 	header := []string{cobrautil.ROW_ADDR, cobrautil.ROW_VERSION, cobrautil.ROW_STATUS}
 	eCmd.SetHeader(header)
 	eCmd.TableNew.SetAutoMergeCellsByColumnIndex(cobrautil.GetIndexSlice(
@@ -85,6 +86,7 @@ func (eCmd *EtcdCommand) Init(cmd *cobra.Command, args []string) error {
 	if addrErr.TypeCode() != cmderror.CODE_SUCCESS {
 		return fmt.Errorf(addrErr.Message)
 	}
+
 	for _, addr := range etcdAddrs {
 		// set metric
 		timeout := viper.GetDuration(config.VIPER_GLOBALE_HTTPTIMEOUT)
@@ -117,6 +119,7 @@ func (eCmd *EtcdCommand) RunCommand(cmd *cobra.Command, args []string) error {
 		size++
 		go func(m *basecmd.Metric) {
 			result, err := basecmd.QueryMetric(m)
+
 			var key string
 			var metricKey string
 			if m.SubUri == STATUS_SUBURI {
@@ -126,13 +129,15 @@ func (eCmd *EtcdCommand) RunCommand(cmd *cobra.Command, args []string) error {
 				key = "version"
 				metricKey = VARSION_METRIC_KEY
 			}
+
 			var value string
 			if err.TypeCode() == cmderror.CODE_SUCCESS {
 				value, err = basecmd.GetKeyValueFromJsonMetric(result, metricKey)
 				if err.TypeCode() != cmderror.CODE_SUCCESS {
 					errs = append(errs, err)
 				}
 			}
+
 			results <- basecmd.MetricResult{
 				Addr:  m.Addrs[0],
 				Key:   key,
@@ -166,21 +171,21 @@ func (eCmd *EtcdCommand) RunCommand(cmd *cobra.Command, args []string) error {
 			break
 		}
 	}
-	mergeErr := cmderror.MergeCmdErrorExceptSuccess(errs)
-	eCmd.Error = mergeErr
 
 	if len(errs) > 0 && len(errs) < len(eCmd.rows) {
 		eCmd.health = cobrautil.HEALTH_WARN
 	} else if len(errs) == 0 {
 		eCmd.health = cobrautil.HEALTH_OK
 	}
 
+	mergeErr := cmderror.MergeCmdErrorExceptSuccess(errs)
+	eCmd.Error = mergeErr
 	list := cobrautil.ListMap2ListSortByKeys(eCmd.rows, eCmd.Header, []string{
 		cobrautil.ROW_STATUS, cobrautil.ROW_VERSION,
 	})
 	eCmd.TableNew.AppendBulk(list)
-
 	eCmd.Result = eCmd.rows
+
 	return nil
 }
 
@@ -206,7 +211,7 @@ func GetEtcdStatus(caller *cobra.Command) (*interface{}, *tablewriter.Table, *cm
 		fmt.Sprintf("--%s", config.FORMAT), config.FORMAT_NOOUT,
 	})
 	config.AlignFlagsValue(caller, etcdCmd.Cmd, []string{
-		config.RPCRETRYTIMES, config.RPCTIMEOUT, config.CURVEFS_MDSADDR,
+		config.RPCRETRYTIMES, config.RPCTIMEOUT, config.CURVEFS_ETCDADDR,
 	})
 	etcdCmd.Cmd.SilenceErrors = true
 	etcdCmd.Cmd.Execute()

diff --git a/tools-v2/pkg/cli/command/curvebs/status/mds/mds.go b/tools-v2/pkg/cli/command/curvebs/status/mds/mds.go
@@ -59,8 +59,8 @@ func NewMdsCommand() *cobra.Command {
 }
 
 func (mCmd *MdsCommand) AddFlags() {
-	config.AddBsMdsFlagOption(mCmd.Cmd)
 	config.AddHttpTimeoutFlag(mCmd.Cmd)
+	config.AddBsMdsFlagOption(mCmd.Cmd)
 	config.AddBsMdsDummyFlagOption(mCmd.Cmd)
 }
 
@@ -84,6 +84,7 @@ func (mCmd *MdsCommand) Init(cmd *cobra.Command, args []string) error {
 	if addrErr.TypeCode() != cmderror.CODE_SUCCESS {
 		return fmt.Errorf(addrErr.Message)
 	}
+
 	for _, addr := range dummyAddrs {
 		// Use the dummy port to access the metric service
 		timeout := viper.GetDuration(config.VIPER_GLOBALE_HTTPTIMEOUT)
@@ -118,16 +119,20 @@ func (mCmd *MdsCommand) RunCommand(cmd *cobra.Command, args []string) error {
 		size++
 		go func(m *basecmd.Metric) {
 			result, err := basecmd.QueryMetric(m)
+
 			var key string
+
 			if m.SubUri == STATUS_SUBURI {
 				key = "status"
 			} else {
 				key = "version"
 			}
+
 			var value string
 			if err.TypeCode() == cmderror.CODE_SUCCESS {
 				value, err = basecmd.GetMetricValue(result)
 			}
+
 			results <- basecmd.MetricResult{
 				Addr:  m.Addrs[0],
 				Key:   key,
@@ -157,18 +162,21 @@ func (mCmd *MdsCommand) RunCommand(cmd *cobra.Command, args []string) error {
 			break
 		}
 	}
+
 	if len(errs) > 0 && len(errs) < len(mCmd.rows) {
 		mCmd.health = cobrautil.HEALTH_WARN
 	} else if len(errs) == 0 {
 		mCmd.health = cobrautil.HEALTH_OK
 	}
+
 	mergeErr := cmderror.MergeCmdErrorExceptSuccess(errs)
 	mCmd.Error = mergeErr
 	list := cobrautil.ListMap2ListSortByKeys(mCmd.rows, mCmd.Header, []string{
 		cobrautil.ROW_STATUS, cobrautil.ROW_VERSION,
 	})
 	mCmd.TableNew.AppendBulk(list)
 	mCmd.Result = mCmd.rows
+
 	return nil
 }