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

fix(region): guest disk iops (#22542)

Browse Source
This commit is contained in:
屈轩
2025-05-15 15:46:12 +08:00
committed by GitHub
parent edd11ea1cd
commit ef36176130
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/guests.go
+1
View File
@@ -377,6 +377,7 @@ type GuestDiskInfo struct {
MediumType string `json:"medium_type"`
StorageType string `json:"storage_type"`
Iops int `json:"iops"`
Throughput int `json:"throughput"`
Bps int `json:"bps"`
ImageId string `json:"image_id,omitempty"`
Image string `json:"image,omitemtpy"`
pkg/compute/models/guest_queries.go
+21 -5
View File
@@ -71,7 +71,15 @@ func (manager *SGuestManager) FetchCustomizeColumns(
gds := fetchGuestDisksInfo(guestIds)
if gds != nil {
for i := range rows {
rows[i].DisksInfo, _ = gds[guestIds[i]]
rows[i].DisksInfo = []api.GuestDiskInfo{}
if disks, ok := gds[guestIds[i]]; ok {
for j := range disks {
if len(rows[i].ManagerId) > 0 {
disks[j].Iops = disks[j].DiskIops
}
rows[i].DisksInfo = append(rows[i].DisksInfo, disks[j].GuestDiskInfo)
}
}
rows[i].DiskCount = len(rows[i].DisksInfo)
shortDescs := []string{}
for _, info := range rows[i].DisksInfo {
@@ -368,12 +376,17 @@ type sGustDiskSize struct {
DiskCount int
}
type sGuestDiskInfo struct {
type GuestDiskInfo struct {
DiskIops int
api.GuestDiskInfo
}
type sGuestDiskInfo struct {
GuestDiskInfo
GuestId string
}
func fetchGuestDisksInfo(guestIds []string) map[string][]api.GuestDiskInfo {
func fetchGuestDisksInfo(guestIds []string) map[string][]GuestDiskInfo {
disks := DiskManager.Query().SubQuery()
guestdisks := GuestdiskManager.Query().SubQuery()
storages := StorageManager.Query().SubQuery()
@@ -392,6 +405,8 @@ func fetchGuestDisksInfo(guestIds []string) map[string][]api.GuestDiskInfo {
storages.Field("medium_type"),
storages.Field("storage_type"),
guestdisks.Field("iops"),
disks.Field("iops").Label("disk_iops"),
disks.Field("throughput"),
guestdisks.Field("bps"),
disks.Field("template_id").Label("image_id"),
guestdisks.Field("guest_id"),
@@ -405,17 +420,18 @@ func fetchGuestDisksInfo(guestIds []string) map[string][]api.GuestDiskInfo {
gds := []sGuestDiskInfo{}
err := q.All(&gds)
if err != nil {
log.Errorf("fetchGuestDisksInfo: %v", err)
return nil
}
imageIds := []string{}
ret := map[string][]api.GuestDiskInfo{}
ret := map[string][]GuestDiskInfo{}
for i := range gds {
if len(gds[i].ImageId) > 0 {
imageIds = append(imageIds, gds[i].ImageId)
}
_, ok := ret[gds[i].GuestId]
if !ok {
ret[gds[i].GuestId] = []api.GuestDiskInfo{}
ret[gds[i].GuestId] = []GuestDiskInfo{}
}
ret[gds[i].GuestId] = append(ret[gds[i].GuestId], gds[i].GuestDiskInfo)
}