opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15215 from zexi/automated-cherry-pick-of-#15214-upstream-master

Browse Source 
Automated cherry pick of #15214: fix(scheduler): do free capacity check when storage filter enabled
This commit is contained in:
Zexi Li
2022-10-20 16:36:39 +08:00
committed by GitHub
parent 141ebfc399 8d28143a80
commit 8696c5e504
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/disk_schedtag_predicate.go
+12 -10
View File
@@ -148,17 +148,19 @@ func (p *DiskSchedtagPredicate) IsResourceFitInput(ctx context.Context, u *core.
}
}
// free capacity check
if storage.FreeCapacity < int64(d.SizeMb) {
return &FailReason{
Reason: fmt.Sprintf("Storage %s free capacity %d < %d(request)", storage.Name, storage.FreeCapacity, d.SizeMb),
Type: StorageOwnership,
if u.GetHypervisorDriver().DoScheduleStorageFilter() {
// free capacity check
if storage.FreeCapacity < int64(d.SizeMb) {
return &FailReason{
Reason: fmt.Sprintf("Storage %s free capacity %d < %d(request)", storage.Name, storage.FreeCapacity, d.SizeMb),
Type: StorageCapacity,
}
}
}
if storage.ActualFreeCapacity < int64(d.SizeMb) {
return &FailReason{
Reason: fmt.Sprintf("Storage %s actual free capacity %d < %d(request)", storage.Name, storage.ActualFreeCapacity, d.SizeMb),
Type: StorageOwnership,
if storage.ActualFreeCapacity < int64(d.SizeMb) {
return &FailReason{
Reason: fmt.Sprintf("Storage %s actual free capacity %d < %d(request)", storage.Name, storage.ActualFreeCapacity, d.SizeMb),
Type: StorageCapacity,
}
}
}
pkg/scheduler/algorithm/predicates/error.go
+1
View File
@@ -129,4 +129,5 @@ const (
StorageType = "storage_type"
StorageOwnership = "storage_ownership"
StorageMedium = "storage_medium"
StorageCapacity = "storage_capacity"
)