astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-11-09 17:21:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(decom): preserve cancellation during finalization

Browse Source 
Signed-off-by: Feng Ruohang <rh@vonng.com>
This commit is contained in:
Feng Ruohang
2026-11-06 23:20:31 +08:00
parent db0c0ffedd
commit 96b3a19d0a
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/erasure-server-pool-decom.go
+6 -2
View File
@@ -182,7 +182,9 @@ func (p *poolMeta) returnResumablePools() []PoolStatus {
}
func (p *poolMeta) DecommissionComplete(idx int) bool {
if p.Pools[idx].Decommission != nil && !p.Pools[idx].Decommission.Complete {
if p.Pools[idx].Decommission != nil &&
!p.Pools[idx].Decommission.Complete &&
!p.Pools[idx].Decommission.Canceled {
p.Pools[idx].LastUpdate = UTCNow()
p.Pools[idx].Decommission.Complete = true
p.Pools[idx].Decommission.Failed = false
@@ -193,7 +195,9 @@ func (p *poolMeta) DecommissionComplete(idx int) bool {
}
func (p *poolMeta) DecommissionFailed(idx int) bool {
if p.Pools[idx].Decommission != nil && !p.Pools[idx].Decommission.Failed {
if p.Pools[idx].Decommission != nil &&
!p.Pools[idx].Decommission.Failed &&
!p.Pools[idx].Decommission.Canceled {
p.Pools[idx].LastUpdate = UTCNow()
p.Pools[idx].Decommission.StartTime = time.Time{}
p.Pools[idx].Decommission.Complete = false
cmd/erasure-server-pool-decom_test.go
+26
View File
@@ -197,3 +197,29 @@ func TestPoolMetaValidate(t *testing.T) {
})
}
}
func TestPoolMetaDecommissionCancellationIsTerminal(t *testing.T) {
t.Parallel()
canceled := poolMeta{Pools: []PoolStatus{{Decommission: &PoolDecommissionInfo{}}}}
if !canceled.DecommissionCancel(0) {
t.Fatal("failed to record cancellation")
}
if canceled.DecommissionFailed(0) {
t.Fatal("a canceled decommission was changed to failed")
}
if canceled.DecommissionComplete(0) {
t.Fatal("a canceled decommission was changed to complete")
}
if got := canceled.returnResumablePools(); len(got) != 0 {
t.Fatalf("canceled decommission is resumable: %+v", got)
}
failed := poolMeta{Pools: []PoolStatus{{Decommission: &PoolDecommissionInfo{}}}}
if !failed.DecommissionFailed(0) {
t.Fatal("failed to record failure")
}
if got := failed.returnResumablePools(); len(got) != 1 {
t.Fatalf("failed decommission is not resumable: %+v", got)
}
}