scheduler: add image zone filter

pkg/compute/guestdrivers/managedvirtual.go

@@ -16,7 +16,6 @@ package guestdrivers
 
 import (
 	"context"
-	"database/sql"
 	"fmt"
 	"math"
 	"time"
@@ -134,38 +133,6 @@ func (self *SManagedVirtualizedGuestDriver) ValidateCreateData(ctx context.Conte
 	if input.Cdrom != "" {
 		return nil, httperrors.NewInputParameterError("%s not support cdrom params", input.Hypervisor)
 	}
-
-	_image, err := models.CachedimageManager.FetchById(input.Disks[0].ImageId)
-	if err != nil {
-		if err == sql.ErrNoRows {
-			return nil, httperrors.NewResourceNotFoundError2("image", input.Disks[0].ImageId)
-		}
-		return nil, httperrors.NewGeneralError(err)
-	}
-	image := _image.(*models.SCachedimage)
-	if image.ImageType == cloudprovider.CachedImageTypeSystem {
-		cloudprovider, err := image.GetCloudprovider()
-		if err != nil {
-			if err == sql.ErrNoRows {
-				return nil, httperrors.NewResourceNotFoundError("failed to found image %s(%s) provider", image.Name, image.Id)
-			}
-			return nil, httperrors.NewGeneralError(err)
-		}
-		provider := models.GetDriver(input.Hypervisor).GetProvider()
-		if provider != cloudprovider.Provider {
-			return nil, httperrors.NewInputParameterError("image %s(%s) not support provider %s only support %s", image.Name, image.Id, provider, cloudprovider.Provider)
-		}
-		if len(input.PreferRegion) == 0 && len(input.PreferZone) == 0 && len(input.PreferHost) == 0 {
-			regions, err := image.GetRegions()
-			if err != nil {
-				log.Warningf("failed to get regions for image %s(%s) error: %v", image.Name, image.Id, err)
-			}
-			if len(regions) > 0 {
-				input.PreferRegion = regions[0].Id
-			}
-		}
-	}
-
 	return input, nil
 }
 

pkg/compute/models/cachedimages.go

@@ -536,14 +536,14 @@ func (image *SCachedimage) GetRegions() ([]SCloudregion, error) {
 	return regions, nil
 }
 
-func (image *SCachedimage) GetUsableZones() ([]SZone, error) {
+func (image *SCachedimage) GetUsableZoneIds() ([]string, error) {
 	zones := ZoneManager.Query().SubQuery()
 	storages := StorageManager.Query().SubQuery()
 	storagecaches := StoragecacheManager.Query().SubQuery()
 	storagecacheimages := StoragecachedimageManager.Query().SubQuery()
 	providers := CloudproviderManager.Query().SubQuery()
 
-	q := zones.Query()
+	q := zones.Query(zones.Field("id"))
 	q = q.Join(storages, sqlchemy.Equals(q.Field("id"), storages.Field("zone_id")))
 	q = q.Join(storagecaches, sqlchemy.Equals(storages.Field("storagecache_id"), storagecaches.Field("id")))
 	q = q.Join(providers, sqlchemy.Equals(providers.Field("id"), storagecaches.Field("manager_id")))
@@ -555,11 +555,23 @@ func (image *SCachedimage) GetUsableZones() ([]SZone, error) {
 	q = q.Filter(sqlchemy.Equals(storagecacheimages.Field("status"), api.CACHED_IMAGE_STATUS_READY))
 	q = q.Filter(sqlchemy.Equals(q.Field("status"), api.ZONE_ENABLE))
 
-	result := []SZone{}
-	err := db.FetchModelObjects(ZoneManager, q, &result)
+	result := []string{}
+	rows, err := q.Rows()
 	if err != nil {
+		if err == sql.ErrNoRows {
+			return nil, nil
+		}
 		return nil, err
 	}
+	defer rows.Close()
+	for rows.Next() {
+		var zoneId string
+		if err := rows.Scan(&zoneId); err != nil {
+			return nil, err
+		}
+		result = append(result, zoneId)
+	}
+
 	return result, nil
 }
 

pkg/scheduler/algorithm/predicates/guest/image_predicate.go

@@ -0,0 +1,83 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package guest
+
+import (
+	"fmt"
+
+	"yunion.io/x/pkg/utils"
+
+	"yunion.io/x/onecloud/pkg/apis/compute"
+	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/compute/models"
+	"yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates"
+	"yunion.io/x/onecloud/pkg/scheduler/core"
+)
+
+type ImagePredicate struct {
+	predicates.BasePredicate
+	cacheImage *models.SCachedimage
+	zones      []string
+}
+
+func (f *ImagePredicate) Name() string {
+	return "disk_image"
+}
+
+func (f *ImagePredicate) Clone() core.FitPredicate {
+	return &ImagePredicate{}
+}
+
+func (f *ImagePredicate) PreExecute(u *core.Unit, cs []core.Candidater) (bool, error) {
+	disks := u.SchedData().Disks
+	if len(disks) == 0 {
+		return false, nil
+	}
+	imageId := disks[0].ImageId
+	if len(imageId) == 0 || u.SchedData().PreferZone != "" {
+		return false, nil
+	}
+	if !utils.IsInStringArray(u.SchedData().Hypervisor, compute.PUBLIC_CLOUD_HYPERVISORS) {
+		return false, nil
+	}
+	obj, err := models.CachedimageManager.FetchById(imageId)
+	if err != nil {
+		return false, fmt.Errorf("Fetch CachedImage %s: %v", imageId, err)
+	}
+	cacheImage := obj.(*models.SCachedimage)
+	if cacheImage.ImageType != cloudprovider.CachedImageTypeSystem {
+		return false, nil
+	}
+	zones, err := cacheImage.GetUsableZoneIds()
+	if err != nil {
+		return false, fmt.Errorf("Fetch CachedImage %s zones: %v", cacheImage.GetName(), err)
+	}
+	f.cacheImage = cacheImage
+	f.zones = zones
+	return true, nil
+}
+
+func (f *ImagePredicate) Execute(u *core.Unit, c core.Candidater) (bool, []core.PredicateFailureReason, error) {
+	h := predicates.NewPredicateHelper(f, u, c)
+	inZone := false
+	hostZoneId := c.Getter().Zone().GetId()
+	if utils.IsInStringArray(hostZoneId, f.zones) {
+		inZone = true
+	}
+	if !inZone {
+		h.Exclude(fmt.Sprintf("Host zone %s not in image usable zones %v", hostZoneId, f.zones))
+	}
+	return h.GetResult()
+}

pkg/scheduler/algorithmprovider/defaults.go

@@ -34,7 +34,7 @@ func defaultPredicates() sets.String {
 		factory.RegisterFitPredicate("c-GuestAggregateFilter", &predicates.AggregatePredicate{}),
 		factory.RegisterFitPredicate("d-GuestMigrateFilter", &predicateguest.MigratePredicate{}),
 		factory.RegisterFitPredicate("e-GuestDomainFilter", &predicates.DomainPredicate{}),
-		//factory.RegisterFitPredicate("e-GuestNestFilter", &predicateguest.NestPredicate{}),
+		factory.RegisterFitPredicate("e-GuestImageFilter", &predicateguest.ImagePredicate{}),
 		//factory.RegisterFitPredicate("f-GuestGroupFilter", &predicateguest.GroupPredicate{}),
 		factory.RegisterFitPredicate("g-GuestCPUFilter", &predicateguest.CPUPredicate{}),
 		factory.RegisterFitPredicate("h-GuestMemoryFilter", &predicateguest.MemoryPredicate{}),