gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 10:06:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enhancement: Cluster info lost MaxDpCntLimit

Browse Source 
Signed-off-by: Tao Li <tomscut@apache.org>
This commit is contained in:
Tao Li 2022-11-01 09:00:08 +08:00 committed by leonrayang
parent 6d466c4d04
commit 1682425bb0
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cli/cmd/cluster.go
View File

@ -53,6 +53,7 @@ const (
nodeMarkDeleteRateKey = "markDeleteRate"
nodeDeleteWorkerSleepMs = "deleteWorkerSleepMs"
nodeAutoRepairRateKey = "autoRepairRate"
nodeMaxDpCntLimit = "maxDpCntLimit"
)
func newClusterInfoCmd(client *master.MasterClient) *cobra.Command {
@ -64,7 +65,7 @@ func newClusterInfoCmd(client *master.MasterClient) *cobra.Command {
var cv *proto.ClusterView
var cn *proto.ClusterNodeInfo
var cp *proto.ClusterIP
var delPara map[string]string
var clusterPara map[string]string
if cv, err = client.AdminAPI().GetCluster(); err != nil {
errout("Error: %v", err)
}
@ -76,14 +77,15 @@ func newClusterInfoCmd(client *master.MasterClient) *cobra.Command {
}
stdout("[Cluster]\n")
stdout(formatClusterView(cv, cn, cp))
if delPara, err = client.AdminAPI().GetDeleteParas(); err != nil {
if clusterPara, err = client.AdminAPI().GetClusterParas(); err != nil {
errout("Error: %v", err)
}
stdout(fmt.Sprintf(" BatchCount : %v\n", delPara[nodeDeleteBatchCountKey]))
stdout(fmt.Sprintf(" MarkDeleteRate : %v\n", delPara[nodeMarkDeleteRateKey]))
stdout(fmt.Sprintf(" DeleteWorkerSleepMs: %v\n", delPara[nodeDeleteWorkerSleepMs]))
stdout(fmt.Sprintf(" AutoRepairRate : %v\n", delPara[nodeAutoRepairRateKey]))
stdout(fmt.Sprintf(" BatchCount : %v\n", clusterPara[nodeDeleteBatchCountKey]))
stdout(fmt.Sprintf(" MarkDeleteRate : %v\n", clusterPara[nodeMarkDeleteRateKey]))
stdout(fmt.Sprintf(" DeleteWorkerSleepMs: %v\n", clusterPara[nodeDeleteWorkerSleepMs]))
stdout(fmt.Sprintf(" AutoRepairRate : %v\n", clusterPara[nodeAutoRepairRateKey]))
stdout(fmt.Sprintf(" MaxDpCntLimit : %v\n", clusterPara[nodeMaxDpCntLimit]))
stdout("\n")
},
}

2
cli/cmd/fmt.go
View File

@ -37,7 +37,7 @@ func formatClusterView(cv *proto.ClusterView, cn *proto.ClusterNodeInfo, cp *pro
sb.WriteString(fmt.Sprintf(" DataNode total : %v GB\n", cv.DataNodeStatInfo.TotalGB))
sb.WriteString(fmt.Sprintf(" Volume count : %v\n", len(cv.VolStatInfo)))
sb.WriteString(fmt.Sprintf(" EbsAddr : %v\n", cp.EbsAddr))
sb.WriteString(fmt.Sprintf(" loadFactor : %v\n", cn.LoadFactor))
sb.WriteString(fmt.Sprintf(" LoadFactor : %v\n", cn.LoadFactor))
return sb.String()
}

2
sdk/master/api_admin.go
View File

@ -477,7 +477,7 @@ func (api *AdminAPI) SetClusterParas(batchCount, markDeleteRate, deleteWorkerSle
return
}
func (api *AdminAPI) GetDeleteParas() (delParas map[string]string, err error) {
func (api *AdminAPI) GetClusterParas() (delParas map[string]string, err error) {
var request = newAPIRequest(http.MethodGet, proto.AdminGetNodeInfo)
if _, err = api.mc.serveRequest(request); err != nil {
return