From 15ecac6bcdb26da66f94de562ade04f361ee2b9c Mon Sep 17 00:00:00 2001 From: chihe Date: Fri, 24 May 2024 16:31:37 +0800 Subject: [PATCH] fix(cli): decommission disk for cli tool add migrationType param Signed-off-by: chihe --- master/cluster.go | 4 +++- master/disk_manager.go | 1 - sdk/master/api_admin.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/master/cluster.go b/master/cluster.go index 2af688611..c407a6441 100644 --- a/master/cluster.go +++ b/master/cluster.go @@ -4562,7 +4562,7 @@ func (c *Cluster) TryDecommissionDisk(disk *DecommissionDisk) { } else { // mark as failed and set decommission src, make sure it can be included in the calculation of progress dp.DecommissionSrcAddr = node.Addr - dp.DecommissionSrcDiskPath = disk.DstAddr + dp.DecommissionSrcDiskPath = disk.DiskPath if strings.Contains(err.Error(), proto.ErrAllReplicaUnavailable.Error()) { dp.DecommissionNeedRollbackTimes = defaultDecommissionRollbackLimit dp.DecommissionNeedRollback = false @@ -4572,6 +4572,8 @@ func (c *Cluster) TryDecommissionDisk(disk *DecommissionDisk) { dp.DecommissionErrorMessage = err.Error() } dp.DecommissionTerm = disk.DecommissionTerm + log.LogWarnf("action[TryDecommissionDisk] disk(%v) set dp(%v) DecommissionTerm %v", + disk.decommissionInfo(), dp.PartitionID, disk.DecommissionTerm) } } else { ns.AddToDecommissionDataPartitionList(dp, c) diff --git a/master/disk_manager.go b/master/disk_manager.go index 831d1fa30..2a636a859 100644 --- a/master/disk_manager.go +++ b/master/disk_manager.go @@ -371,7 +371,6 @@ func (dd *DecommissionDisk) updateDecommissionStatus(c *Cluster, debug bool) (ui stopNum++ stopPartitionIds = append(stopPartitionIds, dp.PartitionID) } - log.LogDebugf("[updateDecommissionStatus] dp(%v) decommission status(%v)", dp.PartitionID, dp.GetDecommissionStatus()) partitionIds = append(partitionIds, dp.PartitionID) } progress = float64(totalNum-len(partitions)) / float64(totalNum) diff --git a/sdk/master/api_admin.go b/sdk/master/api_admin.go index 27e0003c4..c5b635fa2 100644 --- a/sdk/master/api_admin.go +++ b/sdk/master/api_admin.go @@ -630,7 +630,7 @@ func (api *AdminAPI) QueryBadDisks() (badDisks *proto.BadDiskInfos, err error) { func (api *AdminAPI) DecommissionDisk(addr string, disk string) (err error) { return api.mc.request(newRequest(post, proto.DecommissionDisk).Header(api.h). - addParam("addr", addr).addParam("disk", disk)) + addParam("addr", addr).addParam("disk", disk).addParam("decommissionType", "1")) } func (api *AdminAPI) RecommissionDisk(addr string, disk string) (err error) {