改进调度器 disk 选择 storage 的逻辑:

- 调度器选择 disk 对应一组 storages
- 主备机磁盘选择 storage
- 减少公有云选择 storage 的重复代码
This commit is contained in:
Zexi
2019-04-17 17:30:13 +08:00
parent b199346c90
commit 7848a36f32
19 changed files with 122 additions and 141 deletions
+7 -2
View File
@@ -108,8 +108,13 @@ func (self *DiskBatchCreateTask) SaveScheduleResult(ctx context.Context, obj ISc
return
}
//err = disk.SetStorageByHost(hostId, &diskConfig)
err = disk.SetStorage(candidate.Disks[0].StorageId, diskConfig)
storageIds := []string{}
var hostId string
if candidate != nil && len(candidate.Disks) != 0 {
hostId = candidate.HostId
storageIds = candidate.Disks[0].StorageIds
}
err = disk.SetStorageByHost(hostId, diskConfig, storageIds)
if err != nil {
models.QuotaManager.CancelPendingUsage(ctx, self.UserCred, disk.ProjectId, &pendingUsage, &quotaStorage)
disk.SetStatus(self.UserCred, api.DISK_ALLOC_FAILED, err.Error())