shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-30 18:50:18 +03:00
Code Releases Activity

config: validate: Verify iotune, throttle group and filter

Browse Source 
Refactor iotune verification, and verify some rules

* Disk iotune validation can be reused for throttle group validation,
  refactor it into common method "virDomainDiskIoTuneValidate"
* Add "virDomainDefValidateThrottleGroups" to validate throttle groups,
  which in turn calls "virDomainDiskIoTuneValidate"
* Make sure referenced throttle group exists
* Use "iotune" and "throttlefilters" exclusively for specific disk
* Throttle filters cannot be used together with CDROM

Signed-off-by: Chun Feng Wu <danielwuwy@163.com>

* Update of code documentation comments.

Signed-off-by: Harikumar Rajkumar <harirajkumar230@gmail.com>

* Moved validation code from parser to validator
* Removed dead checks after validation

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Chun Feng Wu 2025-02-19 22:27:16 +05:30 committed by Peter Krempa
parent 9a6560f066
commit 2279f9e0ff
2 changed files with 96 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
src/conf/domain_validate.c
View File

@ -692,11 +692,55 @@ virDomainDiskDefValidateStartupPolicy(const virDomainDiskDef *disk)
}
static int
virDomainDiskIoTuneValidate(const virDomainBlockIoTuneInfo blkdeviotune)
{
if ((blkdeviotune.total_bytes_sec &&
blkdeviotune.read_bytes_sec) ||
(blkdeviotune.total_bytes_sec &&
blkdeviotune.write_bytes_sec)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("total and read/write bytes_sec cannot be set at the same time"));
return -1;
}
if ((blkdeviotune.total_iops_sec &&
blkdeviotune.read_iops_sec) ||
(blkdeviotune.total_iops_sec &&
blkdeviotune.write_iops_sec)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("total and read/write iops_sec cannot be set at the same time"));
return -1;
}
if ((blkdeviotune.total_bytes_sec_max &&
blkdeviotune.read_bytes_sec_max) ||
(blkdeviotune.total_bytes_sec_max &&
blkdeviotune.write_bytes_sec_max)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("total and read/write bytes_sec_max cannot be set at the same time"));
return -1;
}
if ((blkdeviotune.total_iops_sec_max &&
blkdeviotune.read_iops_sec_max) ||
(blkdeviotune.total_iops_sec_max &&
blkdeviotune.write_iops_sec_max)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("total and read/write iops_sec_max cannot be set at the same time"));
return -1;
}
return 0;
}
static int
virDomainDiskDefValidate(const virDomainDef *def,
const virDomainDiskDef *disk)
{
virStorageSource *next;
size_t i;
/* disk target is used widely in other code so it must be validated first */
if (!disk->dst) {
@ -746,41 +790,8 @@ virDomainDiskDefValidate(const virDomainDef *def,
}
/* Validate IotuneParse */
if ((disk->blkdeviotune.total_bytes_sec &&
disk->blkdeviotune.read_bytes_sec) ||
(disk->blkdeviotune.total_bytes_sec &&
disk->blkdeviotune.write_bytes_sec)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("total and read/write bytes_sec cannot be set at the same time"));
if (virDomainDiskIoTuneValidate(disk->blkdeviotune) < 0)
return -1;
}
if ((disk->blkdeviotune.total_iops_sec &&
disk->blkdeviotune.read_iops_sec) ||
(disk->blkdeviotune.total_iops_sec &&
disk->blkdeviotune.write_iops_sec)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("total and read/write iops_sec cannot be set at the same time"));
return -1;
}
if ((disk->blkdeviotune.total_bytes_sec_max &&
disk->blkdeviotune.read_bytes_sec_max) ||
(disk->blkdeviotune.total_bytes_sec_max &&
disk->blkdeviotune.write_bytes_sec_max)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("total and read/write bytes_sec_max cannot be set at the same time"));
return -1;
}
if ((disk->blkdeviotune.total_iops_sec_max &&
disk->blkdeviotune.read_iops_sec_max) ||
(disk->blkdeviotune.total_iops_sec_max &&
disk->blkdeviotune.write_iops_sec_max)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("total and read/write iops_sec_max cannot be set at the same time"));
return -1;
}
/* Reject disks with a bus type that is not compatible with the
* given address type. The function considers only buses that are
@ -981,6 +992,32 @@ virDomainDiskDefValidate(const virDomainDef *def,
return -1;
}
if (disk->nthrottlefilters > 0) {
if (disk->blkdeviotune.group_name ||
virDomainBlockIoTuneInfoHasAny(&disk->blkdeviotune)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("block 'throttlefilters' can't be used together with 'iotune' for disk '%1$s'"),
disk->dst);
return -1;
}
if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("cdrom device with throttle filters isn't supported"));
return -1;
}
for (i = 0; i < disk->nthrottlefilters; i++) {
virDomainThrottleFilterDef *filter = disk->throttlefilters[i];
if (!virDomainThrottleGroupByName(def, filter->group_name)) {
virReportError(VIR_ERR_XML_ERROR,
_("throttle group '%1$s' not found"),
filter->group_name);
return -1;
}
}
}
return 0;
}
@ -1906,6 +1943,22 @@ virDomainDefLaunchSecurityValidate(const virDomainDef *def)
#undef CHECK_BASE64_LEN
static int
virDomainDefValidateThrottleGroups(const virDomainDef *def)
{
size_t i;
for (i = 0; i < def->nthrottlegroups; i++) {
virDomainThrottleGroupDef *throttleGroup = def->throttlegroups[i];
if (virDomainDiskIoTuneValidate(*throttleGroup) < 0)
return -1;
}
return 0;
}
static int
virDomainDefValidateInternal(const virDomainDef *def,
virDomainXMLOption *xmlopt)
@ -1964,6 +2017,9 @@ virDomainDefValidateInternal(const virDomainDef *def,
if (virDomainDefLaunchSecurityValidate(def) < 0)
return -1;
if (virDomainDefValidateThrottleGroups(def) < 0)
return -1;
return 0;
}

6
src/qemu/qemu_driver.c
View File

@ -14914,6 +14914,12 @@ qemuDomainDiskBlockIoTuneIsSupported(virDomainDiskDef *disk)
return false;
}
if (disk->throttlefilters) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("block 'iotune' can't be used together with 'throttlefilters' for disk '%1$s'"), disk->dst);
return false;
}
return true;
}