From e252c16a441794aed834df4ed24cee103a616da7 Mon Sep 17 00:00:00 2001 From: zhumingze Date: Fri, 23 May 2025 14:40:04 +0800 Subject: [PATCH] fix(cli): Add decommissionType parameter in cli recommission #1000131203 Signed-off-by: zhumingze --- cli/cmd/disk.go | 8 ++++---- sdk/master/api_admin.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/cmd/disk.go b/cli/cmd/disk.go index be4fe5be7..7238f7ad5 100644 --- a/cli/cmd/disk.go +++ b/cli/cmd/disk.go @@ -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 diff --git a/sdk/master/api_admin.go b/sdk/master/api_admin.go index 12f06a2f9..a75c8646b 100644 --- a/sdk/master/api_admin.go +++ b/sdk/master/api_admin.go @@ -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) {