From cd51076bc6a2815ed1a910edc7f775123ae594d6 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Wed, 20 Aug 2025 12:00:07 +0800 Subject: [PATCH] fix(baremetal-agent): error occurred when removing logical volumes on the arm64 host (#23121) --- pkg/baremetal/utils/raid/megactl/megactl.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/baremetal/utils/raid/megactl/megactl.go b/pkg/baremetal/utils/raid/megactl/megactl.go index 5adbdd70b7..4d729f9b2a 100644 --- a/pkg/baremetal/utils/raid/megactl/megactl.go +++ b/pkg/baremetal/utils/raid/megactl/megactl.go @@ -445,13 +445,13 @@ func (adapter *MegaRaidAdaptor) GetDevices() []*baremetal.BaremetalStorage { func (adapter *MegaRaidAdaptor) GetLogicVolumes() ([]*raiddrivers.RaidLogicalVolume, error) { errs := make([]error, 0) - megaLvs, err := adapter.getMegacliLogicVolumes() - if err != nil { - errs = append(errs, err) + megaLvs, megacliErr := adapter.getMegacliLogicVolumes() + if megacliErr != nil { + errs = append(errs, megacliErr) } - storeLvs, err := adapter.getStorcliLogicVolums() - if err != nil { - errs = append(errs, err) + storeLvs, storcliErr := adapter.getStorcliLogicVolums() + if storcliErr != nil { + errs = append(errs, storcliErr) } if len(megaLvs) > 0 { return megaLvs, nil @@ -459,7 +459,7 @@ func (adapter *MegaRaidAdaptor) GetLogicVolumes() ([]*raiddrivers.RaidLogicalVol if len(storeLvs) > 0 { return storeLvs, nil } - if len(errs) == 0 { + if len(errs) == 0 || megacliErr == nil || storcliErr == nil { // no error, no volume return []*raiddrivers.RaidLogicalVolume{}, nil }