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: optimize vm disk io parameters

Browse Source
This commit is contained in:
Qiu Jian
2021-11-08 10:05:16 +08:00
parent 1b5ec22599
commit 528eb2ab30
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guestdisks.go
+6 -2
View File
@@ -155,14 +155,18 @@ func (self *SGuestdisk) DoSave(ctx context.Context, driver string, cache string,
driver = "scsi"
}
if len(cache) == 0 {
cache = "none"
cache = "writeback"
}
if len(mountpoint) > 0 {
self.Mountpoint = mountpoint
}
self.Driver = driver
self.CacheMode = cache
self.AioMode = "native"
if cache == "none" {
self.AioMode = "native"
} else {
self.AioMode = "threads"
}
return GuestdiskManager.TableSpec().Insert(ctx, self)
}
pkg/hostman/guestman/qemu-arm.go
+9 -1
View File
@@ -34,6 +34,11 @@ func (s *SKVMGuestInstance) getArmMachine() string {
func (s *SKVMGuestInstance) getArmVdiskDesc(disk jsonutils.JSONObject) string {
diskIndex, _ := disk.Int("index")
diskDriver, _ := disk.GetString("driver")
numQueues, _ := disk.Int("num_queues")
if numQueues == 0 {
numQueues = 4
}
if diskDriver == DISK_DRIVER_IDE || diskDriver == DISK_DRIVER_SATA {
// unsupported configuration: IDE controllers are unsupported
@@ -47,6 +52,7 @@ func (s *SKVMGuestInstance) getArmVdiskDesc(disk jsonutils.JSONObject) string {
cmd += fmt.Sprintf(",drive=drive_%d", diskIndex)
if diskDriver == DISK_DRIVER_VIRTIO {
cmd += fmt.Sprintf(",bus=%s,addr=0x%x", s.GetPciBus(), s.GetDiskAddr(int(diskIndex)))
cmd += fmt.Sprintf(",num-queues=%d,vectors=%d,iothread=iothread0", numQueues, numQueues+1)
} else if utils.IsInStringArray(diskDriver, []string{DISK_DRIVER_SCSI, DISK_DRIVER_PVSCSI}) {
cmd += ",bus=scsi.0"
}
@@ -240,6 +246,8 @@ function nic_mtu() {
}
}
cmd += " -object iothread,id=iothread0"
var diskDrivers = []string{}
for _, disk := range disks {
diskDriver, _ := disk.GetString("driver")
@@ -253,7 +261,7 @@ function nic_mtu() {
}
if utils.IsInStringArray(DISK_DRIVER_SCSI, diskDrivers) {
cmd += " -device virtio-scsi-pci,id=scsi"
cmd += " -device virtio-scsi-pci,id=scsi,iothread=iothread0,num_queues=4,vectors=5"
} else if utils.IsInStringArray(DISK_DRIVER_PVSCSI, diskDrivers) {
cmd += " -device pvscsi,id=scsi"
}
pkg/hostman/guestman/qemu-kvmhelper.go
+9 -1
View File
@@ -215,13 +215,20 @@ func (s *SKVMGuestInstance) GetDiskDeviceModel(driver string) string {
func (s *SKVMGuestInstance) getVdiskDesc(disk jsonutils.JSONObject) string {
diskIndex, _ := disk.Int("index")
diskDriver, _ := disk.GetString("driver")
numQueues, _ := disk.Int("num_queues")
isSsd := jsonutils.QueryBoolean(disk, "is_ssd", false)
if numQueues == 0 {
numQueues = 4
}
var cmd = ""
cmd += fmt.Sprintf(" -device %s", s.GetDiskDeviceModel(diskDriver))
cmd += fmt.Sprintf(",drive=drive_%d", diskIndex)
if diskDriver == DISK_DRIVER_VIRTIO {
// virtio-blk
cmd += fmt.Sprintf(",bus=%s,addr=0x%x", s.GetPciBus(), s.GetDiskAddr(int(diskIndex)))
cmd += fmt.Sprintf(",num-queues=%d,vectors=%d,iothread=iothread0", numQueues, numQueues+1)
} else if utils.IsInStringArray(diskDriver, []string{DISK_DRIVER_SCSI, DISK_DRIVER_PVSCSI}) {
cmd += ",bus=scsi.0"
} else if diskDriver == DISK_DRIVER_IDE {
@@ -603,6 +610,7 @@ function nic_mtu() {
}
}
cmd += " -object iothread,id=iothread0"
var diskDrivers = []string{}
for _, disk := range disks {
driver, _ := disk.GetString("driver")
@@ -610,7 +618,7 @@ function nic_mtu() {
}
if utils.IsInStringArray(DISK_DRIVER_SCSI, diskDrivers) {
cmd += " -device virtio-scsi-pci,id=scsi"
cmd += " -device virtio-scsi-pci,id=scsi,iothread=iothread0,num_queues=4,vectors=5"
} else if utils.IsInStringArray(DISK_DRIVER_PVSCSI, diskDrivers) {
cmd += " -device pvscsi,id=scsi"
}