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

fix(cli): decommission disk for cli tool add migrationType param

Browse Source 
Signed-off-by: chihe <chihe@oppo.com>
This commit is contained in:
chihe 2024-05-24 16:31:37 +08:00
parent ae30b2774f
commit 15ecac6bcd
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
master/cluster.go
View File

@ -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)

1
master/disk_manager.go
View File

@ -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)

2
sdk/master/api_admin.go
View File

@ -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) {