From 7420fddad5fa1cd86f24ec54877194194889a357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 25 Feb 2019 11:37:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=81=BF=E5=85=8D=E8=BF=87=E6=BB=A4cloudpr?= =?UTF-8?q?ovider=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/hostdrivers/kvm.go | 2 +- pkg/compute/models/cachedimages.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/compute/hostdrivers/kvm.go b/pkg/compute/hostdrivers/kvm.go index 5a02c49e9a..9ce44db2b3 100644 --- a/pkg/compute/hostdrivers/kvm.go +++ b/pkg/compute/hostdrivers/kvm.go @@ -37,7 +37,7 @@ func (self *SKVMHostDriver) CheckAndSetCacheImage(ctx context.Context, host *mod return err } cacheImage := obj.(*models.SCachedimage) - srcHostCacheImage, err := cacheImage.ChooseSourceStoragecacheInRange(models.HOST_TYPE_HYPERVISOR, []string{host.Id}, []*models.SZone{host.GetZone()}) + srcHostCacheImage, err := cacheImage.ChooseSourceStoragecacheInRange(models.HOST_TYPE_HYPERVISOR, []string{host.Id}, []interface{}{host.GetZone()}) if err != nil { return err } diff --git a/pkg/compute/models/cachedimages.go b/pkg/compute/models/cachedimages.go index eb511d7038..d9554a22e8 100644 --- a/pkg/compute/models/cachedimages.go +++ b/pkg/compute/models/cachedimages.go @@ -258,7 +258,7 @@ func (self *SCachedimage) addRefCount() { } } -func (self *SCachedimage) ChooseSourceStoragecacheInRange(hostType string, excludes []string, rangeObjs interface{}) (*SStoragecachedimage, error) { +func (self *SCachedimage) ChooseSourceStoragecacheInRange(hostType string, excludes []string, rangeObjs []interface{}) (*SStoragecachedimage, error) { storageCachedImage := StoragecachedimageManager.Query().SubQuery() storage := StorageManager.Query().SubQuery() hostStorage := HoststorageManager.Query().SubQuery() @@ -282,16 +282,16 @@ func (self *SCachedimage) ChooseSourceStoragecacheInRange(hostType string, exclu q = q.Filter(sqlchemy.Equals(host.Field("host_type"), hostType)) } - switch v := rangeObjs.(type) { - case []*SZone: - for _, obj := range v { - q = q.Filter(sqlchemy.Equals(host.Field("zone_id"), obj.Id)) - } - case []*SVCenter: - for _, obj := range v { - q = q.Filter(sqlchemy.Equals(host.Field("manager_id"), obj.Id)) + for _, rangeObj := range rangeObjs { + switch v := rangeObj.(type) { + case *SZone: + q = q.Filter(sqlchemy.Equals(host.Field("zone_id"), v.Id)) + case *SCloudprovider: + q = q.Filter(sqlchemy.Equals(host.Field("manager_id"), v.Id)) } } + q.DebugQuery() + err := db.FetchModelObjects(StoragecachedimageManager, q, &scimgs) if err != nil { return nil, err From 4c01b7ad2abef04cdc55c3ef0f1592e938befcbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 25 Feb 2019 11:51:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/cachedimages.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/compute/models/cachedimages.go b/pkg/compute/models/cachedimages.go index d9554a22e8..53c689eee9 100644 --- a/pkg/compute/models/cachedimages.go +++ b/pkg/compute/models/cachedimages.go @@ -290,7 +290,6 @@ func (self *SCachedimage) ChooseSourceStoragecacheInRange(hostType string, exclu q = q.Filter(sqlchemy.Equals(host.Field("manager_id"), v.Id)) } } - q.DebugQuery() err := db.FetchModelObjects(StoragecachedimageManager, q, &scimgs) if err != nil {