From 5054e618cb57f30e0cb7fc14e28c68f3ffc2647c Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Fri, 18 Jun 2021 10:54:14 +0800 Subject: [PATCH] fix(region): clean schedule cache when host add or delete netif --- pkg/baremetal/manager.go | 5 +++-- pkg/compute/models/hosts.go | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/baremetal/manager.go b/pkg/baremetal/manager.go index 9c5060112c..6ffbb27ee4 100644 --- a/pkg/baremetal/manager.go +++ b/pkg/baremetal/manager.go @@ -2369,8 +2369,9 @@ func (s *SBaremetalServer) GetDiskConfig() ([]*api.BaremetalDiskConfig, error) { if len(layouts) != 0 { firstDisk := layouts[0] - // convert to normal order if first disk is PCIE driver - if firstDisk.Conf.Driver == baremetal.DISK_DRIVER_PCIE { + // convert to normal order if first disk is Linux or PCIE driver + driver := firstDisk.Conf.Driver + if utils.IsInStringArray(driver, []string{baremetal.DISK_DRIVER_LINUX, baremetal.DISK_DRIVER_PCIE}) { return baremetal.GetLayoutDiskConfig(layouts), nil } } diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index 0f708ed09e..fac935e270 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -4300,6 +4300,7 @@ func (self *SHost) addNetif(ctx context.Context, userCred mcclient.TokenCredenti return httperrors.NewBadRequestError("%v", err) } } + self.ClearSchedDescCache() return nil } @@ -4612,6 +4613,7 @@ func (self *SHost) RemoveNetif(ctx context.Context, userCred mcclient.TokenCrede } } } + self.ClearSchedDescCache() return nil }