From 66eff5409fea5d2222e9cfff927e4701519245cf Mon Sep 17 00:00:00 2001 From: Chin-Ya Huang Date: Thu, 5 Sep 2024 12:17:31 +0800 Subject: [PATCH] feat(v2/auto-salvage): remove blocking for v2 volumes longhorn/longhorn-8430 Signed-off-by: Chin-Ya Huang --- controller/volume_controller.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/controller/volume_controller.go b/controller/volume_controller.go index af658367e9..7b41947a77 100644 --- a/controller/volume_controller.go +++ b/controller/volume_controller.go @@ -1333,11 +1333,8 @@ func (c *VolumeController) ReconcileVolumeState(v *longhorn.Volume, es map[strin // At this moment, Longhorn goes into the IF statement below this IF statement and salvage all replicas. if autoSalvage && !v.Status.IsStandby && !v.Status.RestoreRequired { // Since all replica failed and autoSalvage is enable, mark engine controller salvage requested - // TODO: SalvageRequested is meanningless for v2 volume - if types.IsDataEngineV1(v.Spec.DataEngine) { - e.Spec.SalvageRequested = true - log.Infof("All replicas are failed, set engine salvageRequested to %v", e.Spec.SalvageRequested) - } + e.Spec.SalvageRequested = true + log.Infof("All replicas are failed, set engine salvageRequested to %v", e.Spec.SalvageRequested) } // make sure the volume is detached before automatically salvage replicas if autoSalvage && v.Status.State == longhorn.VolumeStateDetached && !v.Status.IsStandby && !v.Status.RestoreRequired {