From 19445ad5741fd204ddbd26c66fba3229ec7ef82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Thu, 17 Aug 2023 18:13:13 +0800 Subject: [PATCH] fix(region): avoid sync esxi panic (#17791) --- pkg/compute/models/hosts.go | 2 +- pkg/compute/models/netinterfaces.go | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index 1205915489..9ddb03143a 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -4551,7 +4551,7 @@ func (h *SHost) addNetif(ctx context.Context, userCred mcclient.TokenCredential, } netif, err := NetInterfaceManager.FetchByMacVlan(mac, vlanId) if err != nil { - if err != sql.ErrNoRows { + if errors.Cause(err) != sql.ErrNoRows { return httperrors.NewInternalServerError("fail to fetch netif by mac %s: %s", mac, err) } // else not found diff --git a/pkg/compute/models/netinterfaces.go b/pkg/compute/models/netinterfaces.go index 94464fafd7..3889535aef 100644 --- a/pkg/compute/models/netinterfaces.go +++ b/pkg/compute/models/netinterfaces.go @@ -96,11 +96,7 @@ func (manager *SNetInterfaceManager) FetchByMacVlan(mac string, vlanId int) (*SN ret := &SNetInterface{} err := q.First(ret) if err != nil { - if errors.Cause(err) == sql.ErrNoRows { - return nil, nil - } else { - return nil, errors.Wrap(err, "Query") - } + return nil, errors.Wrapf(err, "First") } ret.SetModelManager(manager, ret) return ret, nil