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

fix: 避免Openstack越过存储检查

Browse Source
This commit is contained in:
Qu Xuan
2019-11-12 15:14:55 +08:00
parent d2b65bb820
commit eb1810a349
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/openstack.go
+2
View File
@@ -45,6 +45,8 @@ func (self *SOpenStackGuestDriver) DoScheduleMemoryFilter() bool { return true }
func (self *SOpenStackGuestDriver) DoScheduleSKUFilter() bool { return false }
func (self *SOpenStackGuestDriver) DoScheduleStorageFilter() bool { return true }
func (self *SOpenStackGuestDriver) GetHypervisor() string {
return api.HYPERVISOR_OPENSTACK
}
pkg/compute/models/guest_actions.go
+4 -1
View File
@@ -2256,6 +2256,9 @@ func (self *SGuest) PerformChangeConfig(ctx context.Context, userCred mcclient.T
if err != nil {
return nil, httperrors.NewUnsupportOperationError(err.Error())
}
if !storage.IsEmulated && storage.GetFreeCapacity() < int64(addDisk) {
return nil, httperrors.NewInsufficientResourceError("Not enough free space")
}
diskSizes[storage.Id] = diskSizes[storage.Id] + diskConf.SizeMb - oldSize
}
}
@@ -2271,7 +2274,7 @@ func (self *SGuest) PerformChangeConfig(ctx context.Context, userCred mcclient.T
return nil, httperrors.NewBadRequestError("Fetch storage error: %s", err)
}
storage := iStorage.(*SStorage)
if storage.GetFreeCapacity() > 0 && storage.GetFreeCapacity() < int64(needSize) {
if !storage.IsEmulated && storage.GetFreeCapacity() < int64(needSize) {
return nil, httperrors.NewInsufficientResourceError("Not enough free space")
}
}