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

fix(cli): Add decommissionType parameter in cli recommission #1000131203

Browse Source 
Signed-off-by: zhumingze <zhumingze@oppo.com>
This commit is contained in:
zhumingze 2025-05-23 14:40:04 +08:00 committed by zhumingze1108
parent 1cf0bafea2
commit e252c16a44
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/cmd/disk.go
View File

@ -176,18 +176,18 @@ const (
func newRecommissionDiskCmd(client *master.MasterClient) *cobra.Command {
cmd := &cobra.Command{
Use: CliOpRecommission + " [DATA NODE ADDR] [DISK]",
Use: CliOpRecommission + " [DATA NODE ADDR] [DISK] [RecommissionType]",
Short: cmdRecommissionDisksShort,
Args: cobra.MinimumNArgs(2),
Args: cobra.MinimumNArgs(3),
Run: func(cmd *cobra.Command, args []string) {
var err error
defer func() {
errout(err)
}()
if err = client.AdminAPI().RecommissionDisk(args[0], args[1]); err != nil {
if err = client.AdminAPI().RecommissionDisk(args[0], args[1], args[2]); err != nil {
return
}
stdout("Mark disk %v:%v to be recommissioned\n", args[0], args[1])
stdout("Mark disk %v:%v recommissionType %v to be recommissioned\n", args[0], args[1], args[2])
},
}
return cmd

4
sdk/master/api_admin.go
View File

@ -762,9 +762,9 @@ func (api *AdminAPI) DecommissionDisk(addr string, disk string, weight int) (err
addParam("addr", addr).addParam("disk", disk).addParam("decommissionType", "1").addParam("weight", strconv.Itoa(weight)))
}
func (api *AdminAPI) RecommissionDisk(addr string, disk string) (err error) {
func (api *AdminAPI) RecommissionDisk(addr string, disk string, recommissionType string) (err error) {
return api.mc.request(newRequest(post, proto.RecommissionDisk).Header(api.h).
addParam("addr", addr).addParam("disk", disk))
addParam("addr", addr).addParam("disk", disk).addParam("recommissionType", recommissionType))
}
func (api *AdminAPI) QueryDecommissionDiskProgress(addr string, disk string) (progress *proto.DecommissionProgress, err error) {