fix bs check server based on pr2463

Signed-off-by: caoxianfei1 <caoxianfei@corp.netease.com>
opencurve · Jul 26, 2023 · b2c1df6 · b2c1df6
1 parent 5d2e3e4
commit b2c1df6
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 619 deletions.
diff --git a/tools-v2/README.md b/tools-v2/README.md
@@ -1749,7 +1749,6 @@ Output:
 
 ### curve bs
 
-<<<<<<< HEAD
 | old                                  | new                               |
 | ------------------------------------ | --------------------------------- |
 | curve_ops_tool logical-pool-list     | curve bs list logical-pool        |
@@ -1786,44 +1785,5 @@ Output:
 | curve_ops_tool status                |                                   |
 | curve_ops_tool check-consistency     |                                   |
 | curve_ops_tool check-chunkserver     |                                   |
-| curve_ops_tool check-server          |                                   |
-
-=======
-| old                                  | new                            |
-| ------------------------------------ | ------------------------------ |
-| curve_ops_tool logical-pool-list     | curve bs list logical-pool     |
-| curve_ops_tool get -fileName=        | curve bs query file -path      |
-| curve_ops_tool etcd-status           | curve bs status etcd           |
-| curve_ops_tool mds-status            | curve bs status mds            |
-| curve_ops_tool server-list           | curve bs list server           |
-| curve_ops_tool client-list           | curve bs list client           |
-| curve_ops_tool delete                | curve bs delete file           |
-| curve_ops_tool list                  | curve bs list dir              |
-| curve_ops_tool create                | curve bs create file/dir       |
-| curve_ops_tool seginfo               | curve bs query seginfo         |
-| curve_ops_tool chunk-location        | curve bs query chunk           |
-| curve_ops_tool remove-peer           | curve bs delete peer           |
-| curve_ops_tool reset-peer            | curve bs update peer           |
-| curve_ops_tool space                 | curve bs list space            |
-| curve_ops_tool update-throttle       | curve bs update throttle       |
-| curve_ops_tool check-copyset         | curve bs check copyset         |
-| curve_ops_tool client-status         | curve bs status client         |
-| curve_ops_tool check-operator        | curve bs check operator        |
-| curve_ops_tool check-server          | curve bs check server          |
-| curve_ops_tool snapshot-clone-status | curve bs status snapshotserver |
-| curve_ops_tool transfer-leader       | curve bs update leader         |
-| curve_ops_tool do-snapshot           | curve bs snapshot copyset      |
-| curve_ops_tool set-scan-state        | curve bs update scan-state     |
-| curve_ops_tool chunkserver-status    | curve bs status chunkserver    |
-| curve_ops_tool status                |                                |
-| curve_ops_tool copysets-status       |                                |
-| curve_ops_tool chunkserver-list      | curve bs list chunkserver      |
-| curve_ops_tool clean-recycle         |                                |
-| curve_ops_tool check-consistency     |                                |
-| curve_ops_tool do-snapshot-all       |                                |
-| curve_ops_tool check-chunkserver     |                                |
-| curve_ops_tool list-may-broken-vol   |                                |
-| curve_ops_tool set-copyset-availflag |                                |
-| curve_ops_tool rapid-leader-schedule |                                |
-| curve_ops_tool scan-status           |                                |
->>>>>>> fix bs check server
+| curve_ops_tool check-server          | curve bs check server             |
+
diff --git a/tools-v2/internal/error/error.go b/tools-v2/internal/error/error.go
@@ -475,9 +475,6 @@ var (
 	ErrBsGetAllSnapshotResult = func() *CmdError {
 		return NewInternalCmdError(72, "get all snapshot results fail, err: %s")
 	}
-	ErrBsGetChunkServerInfos = func() *CmdError {
-		return NewInternalCmdError(55, "get chunkserver infos fail, err: %s")
-	}
 
 	// http error
 	ErrHttpUnreadableResult = func() *CmdError {

diff --git a/tools-v2/internal/utils/row.go b/tools-v2/internal/utils/row.go
@@ -119,13 +119,14 @@ const (
 	ROW_AVAILFLAG            = "availFlag"
 	ROW_DRYRUN               = "dryrun"
 
-	ROW_RW_STATUS         = "rwStatus"
-	ROW_DISK_STATE        = "diskState"
-	ROW_COPYSET_NUM       = "copysetNum"
-	ROW_DISK_CAPACITY     = "diskCapacity"
-	ROW_DISK_USED         = "diskUsed"
-	ROW_UNHEALTHY_COPYSET = "unhealthyCopyset"
-	ROW_EXT_ADDR          = "extAddr"
+	ROW_RW_STATUS               = "rwStatus"
+	ROW_DISK_STATE              = "diskState"
+	ROW_COPYSET_NUM             = "copysetNum"
+	ROW_DISK_CAPACITY           = "diskCapacity"
+	ROW_DISK_USED               = "diskUsed"
+	ROW_UNHEALTHY_COPYSET       = "unhealthyCopyset"
+	ROW_UNHEALTHY_COPYSET_RATIO = "unhealthyCopysetRatio"
+	ROW_EXT_ADDR                = "extAddr"
 
 	// s3
 	ROW_S3CHUNKINFO_CHUNKID = "s3ChunkId"

diff --git a/tools-v2/pkg/cli/command/curvebs/check/server/get_chunk_info.go b/tools-v2/pkg/cli/command/curvebs/check/server/get_chunk_info.go
diff --git a/tools-v2/pkg/cli/command/curvebs/check/server/get_copyset_ids.go b/tools-v2/pkg/cli/command/curvebs/check/server/get_copyset_ids.go