1:52 p.m.
Ilias Stamatis (2):
test_driver: implement testDomainGetBlockIoTune
test_driver: implement virDomainSetBlockIoTune
src/test/test_driver.c | 361 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 361 insertions(+)
--
2.22.0
1:52 p.m.
New subject: [libvirt] [PATCH v2 1/2] test_driver: implement testDomainGetBlockIoTune
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/test/test_driver.c | 102 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 102 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2b5376ec28..14b7d683e1 100755
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3611,6 +3611,107 @@ testDomainGetInterfaceParameters(virDomainPtr dom,
virDomainObjEndAPI(&vm);
return ret;
}
+
+
+static int
+testDomainGetBlockIoTune(virDomainPtr dom,
+ const char *path,
+ virTypedParameterPtr params,
+ int *nparams,
+ unsigned int flags)
+{
+ virDomainObjPtr vm = NULL;
+ virDomainDefPtr def = NULL;
+ virDomainDiskDefPtr disk;
+ virDomainBlockIoTuneInfo reply = {0};
+ int ret = -1;
+
+ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+ VIR_DOMAIN_AFFECT_CONFIG |
+ VIR_TYPED_PARAM_STRING_OKAY, -1);
+
+ flags &= ~VIR_TYPED_PARAM_STRING_OKAY;
+
+ if (*nparams == 0) {
+ *nparams = 20;
+ return 0;
+ }
+
+ if (!(vm = testDomObjFromDomain(dom)))
+ return -1;
+
+ if (!(def = virDomainObjGetOneDef(vm, flags)))
+ goto cleanup;
+
+ if (!(disk = virDomainDiskByName(def, path, true))) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("disk '%s' was not found in the domain
config"),
+ path);
+ goto cleanup;
+ }
+
+ reply = disk->blkdeviotune;
+ if (VIR_STRDUP(reply.group_name, disk->blkdeviotune.group_name) < 0)
+ goto cleanup;
+
+ TEST_SET_PARAM(0, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC,
+ VIR_TYPED_PARAM_ULLONG, reply.total_bytes_sec);
+ TEST_SET_PARAM(1, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC,
+ VIR_TYPED_PARAM_ULLONG, reply.read_bytes_sec);
+ TEST_SET_PARAM(2, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC,
+ VIR_TYPED_PARAM_ULLONG, reply.write_bytes_sec);
+
+ TEST_SET_PARAM(3, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG, reply.total_iops_sec);
+ TEST_SET_PARAM(4, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG, reply.read_iops_sec);
+ TEST_SET_PARAM(5, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG, reply.write_iops_sec);
+
+ TEST_SET_PARAM(6, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG, reply.total_bytes_sec_max);
+ TEST_SET_PARAM(7, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG, reply.read_bytes_sec_max);
+ TEST_SET_PARAM(8, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG, reply.write_bytes_sec_max);
+
+ TEST_SET_PARAM(9, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG, reply.total_iops_sec_max);
+ TEST_SET_PARAM(10, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG, reply.read_iops_sec_max);
+ TEST_SET_PARAM(11, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG, reply.write_iops_sec_max);
+
+ TEST_SET_PARAM(12, VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG, reply.size_iops_sec);
+
+ TEST_SET_PARAM(13, VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME,
+ VIR_TYPED_PARAM_STRING, reply.group_name);
+ reply.group_name = NULL;
+
+ TEST_SET_PARAM(14, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG, reply.total_bytes_sec_max_length);
+ TEST_SET_PARAM(15, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG, reply.read_bytes_sec_max_length);
+ TEST_SET_PARAM(16, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG, reply.write_bytes_sec_max_length);
+
+ TEST_SET_PARAM(17, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG, reply.total_iops_sec_max_length);
+ TEST_SET_PARAM(18, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG, reply.read_iops_sec_max_length);
+ TEST_SET_PARAM(19, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG, reply.write_iops_sec_max_length);
+
+ if (*nparams > 20)
+ *nparams = 20;
+
+ ret = 0;
+ cleanup:
+ VIR_FREE(reply.group_name);
+ virDomainObjEndAPI(&vm);
+ return ret;
+}
#undef TEST_SET_PARAM
@@ -9019,6 +9120,7 @@ static virHypervisorDriver testHypervisorDriver = {
.domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */
.domainSetInterfaceParameters = testDomainSetInterfaceParameters, /* 5.6.0 */
.domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */
+ .domainGetBlockIoTune = testDomainGetBlockIoTune, /* 5.7.0 */
.connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */
.connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */
.domainCreate = testDomainCreate, /* 0.1.11 */
--
2.22.0
3:33 a.m.
New subject: [libvirt] [PATCH v2 1/2] test_driver: implement testDomainGetBlockIoTune
No need to CC me explicitly (especially for just a single patch of the series),
all libvirt devs are subscribed to the list.
Regards,
Erik
4:36 a.m.
New subject: [libvirt] [PATCH v2 1/2] test_driver: implement testDomainGetBlockIoTune
On Mon, Aug 12, 2019 at 11:33 AM Erik Skultety <eskultet(a)redhat.com> wrote:
No need to CC me explicitly (especially for just a single patch of the series),
all libvirt devs are subscribed to the list.
Regards,
Erik
I didn't do that intentionally. I think git send-email added you in
the CC list because your e-mail address is contained in the commit
message and I didn't notice when (and if) it told me so :)
Ilias
1:53 p.m.
New subject: [libvirt] [PATCH v2 2/2] test_driver: implement virDomainSetBlockIoTune
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 259 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 259 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 14b7d683e1..009bc18a73 100755
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3613,6 +3613,264 @@ testDomainGetInterfaceParameters(virDomainPtr dom,
}
+#define TEST_BLOCK_IOTUNE_MAX 1000000000000000LL
+
+static int
+testDomainSetBlockIoTune(virDomainPtr dom,
+ const char *path,
+ virTypedParameterPtr params,
+ int nparams,
+ unsigned int flags)
+{
+ virDomainObjPtr vm = NULL;
+ virDomainDefPtr def = NULL;
+ virDomainBlockIoTuneInfo info = {0};
+ virDomainDiskDefPtr conf_disk = NULL;
+ virTypedParameterPtr eventParams = NULL;
+ int eventNparams = 0;
+ int eventMaxparams = 0;
+ size_t i;
+ int ret = -1;
+
+ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+ VIR_DOMAIN_AFFECT_CONFIG, -1);
+
+ if (virTypedParamsValidate(params, nparams,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME,
+ VIR_TYPED_PARAM_STRING,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ NULL) < 0)
+ return -1;
+
+ if (!(vm = testDomObjFromDomain(dom)))
+ return -1;
+
+ if (!(def = virDomainObjGetOneDef(vm, flags)))
+ goto cleanup;
+
+ if (!(conf_disk = virDomainDiskByName(def, path, true))) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("missing persistent configuration for disk
'%s'"),
+ path);
+ goto cleanup;
+ }
+
+ info = conf_disk->blkdeviotune;
+ if (VIR_STRDUP(info.group_name, conf_disk->blkdeviotune.group_name) < 0)
+ goto cleanup;
+
+ if (virTypedParamsAddString(&eventParams, &eventNparams,
&eventMaxparams,
+ VIR_DOMAIN_TUNABLE_BLKDEV_DISK, path) < 0)
+ goto cleanup;
+
+#define SET_IOTUNE_FIELD(FIELD, STR, TUNABLE_STR) \
+ if (STREQ(param->field, STR)) { \
+ info.FIELD = param->value.ul; \
+ if (virTypedParamsAddULLong(&eventParams, &eventNparams, \
+ &eventMaxparams, \
+ TUNABLE_STR, \
+ param->value.ul) < 0) \
+ goto cleanup; \
+ continue; \
+ }
+
+ for (i = 0; i < nparams; i++) {
+ virTypedParameterPtr param = ¶ms[i];
+
+ if (param->value.ul > TEST_BLOCK_IOTUNE_MAX) {
+ virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
+ _("block I/O throttle limit value must"
+ " be no more than %llu"), TEST_BLOCK_IOTUNE_MAX);
+ goto cleanup;
+ }
+
+ SET_IOTUNE_FIELD(total_bytes_sec, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC,
+ VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC);
+ SET_IOTUNE_FIELD(read_bytes_sec, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC,
+ VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC);
+ SET_IOTUNE_FIELD(write_bytes_sec, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC,
+ VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC);
+ SET_IOTUNE_FIELD(total_iops_sec, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC,
+ VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC);
+ SET_IOTUNE_FIELD(read_iops_sec, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC,
+ VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC);
+ SET_IOTUNE_FIELD(write_iops_sec, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC,
+ VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC);
+
+ SET_IOTUNE_FIELD(total_bytes_sec_max,
VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX,
+ VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX);
+ SET_IOTUNE_FIELD(read_bytes_sec_max, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX,
+ VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX);
+ SET_IOTUNE_FIELD(write_bytes_sec_max,
VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX,
+ VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX);
+ SET_IOTUNE_FIELD(total_iops_sec_max, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX,
+ VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX);
+ SET_IOTUNE_FIELD(read_iops_sec_max, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX,
+ VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX);
+ SET_IOTUNE_FIELD(write_iops_sec_max, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX,
+ VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX);
+ SET_IOTUNE_FIELD(size_iops_sec, VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC,
+ VIR_DOMAIN_TUNABLE_BLKDEV_SIZE_IOPS_SEC);
+
+ if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME)) {
+ VIR_FREE(info.group_name);
+ if (VIR_STRDUP(info.group_name, param->value.s) < 0)
+ goto cleanup;
+ if (virTypedParamsAddString(&eventParams,
+ &eventNparams,
+ &eventMaxparams,
+ VIR_DOMAIN_TUNABLE_BLKDEV_GROUP_NAME,
+ param->value.s) < 0)
+ goto cleanup;
+ continue;
+ }
+
+ SET_IOTUNE_FIELD(total_bytes_sec_max_length,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH,
+ VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX_LENGTH);
+ SET_IOTUNE_FIELD(read_bytes_sec_max_length,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH,
+ VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH);
+ SET_IOTUNE_FIELD(write_bytes_sec_max_length,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH,
+ VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH);
+ SET_IOTUNE_FIELD(total_iops_sec_max_length,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH,
+ VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX_LENGTH);
+ SET_IOTUNE_FIELD(read_iops_sec_max_length,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH,
+ VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH);
+ SET_IOTUNE_FIELD(write_iops_sec_max_length,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH,
+ VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC_MAX_LENGTH);
+ }
+#undef SET_IOTUNE_FIELD
+
+ if ((info.total_bytes_sec && info.read_bytes_sec) ||
+ (info.total_bytes_sec && info.write_bytes_sec)) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("total and read/write of bytes_sec "
+ "cannot be set at the same time"));
+ goto cleanup;
+ }
+
+ if ((info.total_iops_sec && info.read_iops_sec) ||
+ (info.total_iops_sec && info.write_iops_sec)) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("total and read/write of iops_sec "
+ "cannot be set at the same time"));
+ goto cleanup;
+ }
+
+ if ((info.total_bytes_sec_max && info.read_bytes_sec_max) ||
+ (info.total_bytes_sec_max && info.write_bytes_sec_max)) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("total and read/write of bytes_sec_max "
+ "cannot be set at the same time"));
+ goto cleanup;
+ }
+
+ if ((info.total_iops_sec_max && info.read_iops_sec_max) ||
+ (info.total_iops_sec_max && info.write_iops_sec_max)) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("total and read/write of iops_sec_max "
+ "cannot be set at the same time"));
+ goto cleanup;
+ }
+
+ if (info.total_bytes_sec > info.total_bytes_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("total_bytes_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.read_bytes_sec > info.read_bytes_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("read_bytes_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.write_bytes_sec > info.write_bytes_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("write_bytes_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.total_iops_sec > info.total_iops_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("total_iops_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.read_iops_sec > info.read_iops_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("read_iops_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.write_iops_sec > info.write_iops_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("write_iops_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (virDomainDiskSetBlockIOTune(conf_disk, &info) < 0)
+ goto cleanup;
+ info.group_name = NULL;
+
+ ret = 0;
+ cleanup:
+ VIR_FREE(info.group_name);
+ virDomainObjEndAPI(&vm);
+ if (eventNparams)
+ virTypedParamsFree(eventParams, eventNparams);
+ return ret;
+}
+
+
static int
testDomainGetBlockIoTune(virDomainPtr dom,
const char *path,
@@ -9120,6 +9378,7 @@ static virHypervisorDriver testHypervisorDriver = {
.domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */
.domainSetInterfaceParameters = testDomainSetInterfaceParameters, /* 5.6.0 */
.domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */
+ .domainSetBlockIoTune = testDomainSetBlockIoTune, /* 5.7.0 */
.domainGetBlockIoTune = testDomainGetBlockIoTune, /* 5.7.0 */
.connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */
.connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */
--
2.22.0
3:35 a.m.
New subject: [libvirt] [PATCH v2 2/2] test_driver: implement virDomainSetBlockIoTune
On Fri, Aug 09, 2019 at 09:53:00PM +0300, Ilias Stamatis wrote:
Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com>
---
src/test/test_driver.c | 259 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 259 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 14b7d683e1..009bc18a73 100755
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3613,6 +3613,264 @@ testDomainGetInterfaceParameters(virDomainPtr dom,
}
+#define TEST_BLOCK_IOTUNE_MAX 1000000000000000LL
+
+static int
+testDomainSetBlockIoTune(virDomainPtr dom,
+ const char *path,
+ virTypedParameterPtr params,
+ int nparams,
+ unsigned int flags)
+{
+ virDomainObjPtr vm = NULL;
+ virDomainDefPtr def = NULL;
+ virDomainBlockIoTuneInfo info = {0};
+ virDomainDiskDefPtr conf_disk = NULL;
+ virTypedParameterPtr eventParams = NULL;
+ int eventNparams = 0;
+ int eventMaxparams = 0;
+ size_t i;
+ int ret = -1;
+
+ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+ VIR_DOMAIN_AFFECT_CONFIG, -1);
+
+ if (virTypedParamsValidate(params, nparams,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME,
+ VIR_TYPED_PARAM_STRING,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX_LENGTH,
+ VIR_TYPED_PARAM_ULLONG,
+ NULL) < 0)
+ return -1;
+
+ if (!(vm = testDomObjFromDomain(dom)))
+ return -1;
+
+ if (!(def = virDomainObjGetOneDef(vm, flags)))
+ goto cleanup;
+
+ if (!(conf_disk = virDomainDiskByName(def, path, true))) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("missing persistent configuration for disk
'%s'"),
+ path);
+ goto cleanup;
+ }
+
+ info = conf_disk->blkdeviotune;
+ if (VIR_STRDUP(info.group_name, conf_disk->blkdeviotune.group_name) < 0)
+ goto cleanup;
+
+ if (virTypedParamsAddString(&eventParams, &eventNparams,
&eventMaxparams,
+ VIR_DOMAIN_TUNABLE_BLKDEV_DISK, path) < 0)
+ goto cleanup;
+
+#define SET_IOTUNE_FIELD(FIELD, STR, TUNABLE_STR) \
+ if (STREQ(param->field, STR)) { \
+ info.FIELD = param->value.ul; \
+ if (virTypedParamsAddULLong(&eventParams, &eventNparams, \
+ &eventMaxparams, \
+ TUNABLE_STR, \
+ param->value.ul) < 0) \
+ goto cleanup; \
+ continue; \
+ }
+
+ for (i = 0; i < nparams; i++) {
+ virTypedParameterPtr param = ¶ms[i];
+
+ if (param->value.ul > TEST_BLOCK_IOTUNE_MAX) {
+ virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
+ _("block I/O throttle limit value must"
+ " be no more than %llu"),
TEST_BLOCK_IOTUNE_MAX);
+ goto cleanup;
+ }
+
+ SET_IOTUNE_FIELD(total_bytes_sec, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC,
+ VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC);
Long lines, I'll wrap them before merging.
...
+
+ if (info.total_bytes_sec > info.total_bytes_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("total_bytes_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.read_bytes_sec > info.read_bytes_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("read_bytes_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.write_bytes_sec > info.write_bytes_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("write_bytes_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.total_iops_sec > info.total_iops_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("total_iops_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.read_iops_sec > info.read_iops_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("read_iops_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
+
+ if (info.write_iops_sec > info.write_iops_sec_max) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("write_iops_sec "
+ "cannot be set higher than its corresponding max
value"));
+ goto cleanup;
+ }
Repetitive. I'll squash the following diff in before pushing:
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4340c55e6f..5f5c512571 100755
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3828,47 +3828,25 @@ testDomainSetBlockIoTune(virDomainPtr dom,
goto cleanup;
}
- if (info.total_bytes_sec > info.total_bytes_sec_max) {
- virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("total_bytes_sec "
- "cannot be set higher than its corresponding max
value"));
- goto cleanup;
- }
- if (info.read_bytes_sec > info.read_bytes_sec_max) {
- virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("read_bytes_sec "
- "cannot be set higher than its corresponding max
value"));
- goto cleanup;
- }
+#define TEST_BLOCK_IOTUNE_MAX_CHECK(FIELD, FIELD_MAX) \
+ do { \
+ if (info.FIELD > info.FIELD_MAX) { \
+ virReportError(VIR_ERR_INVALID_ARG, \
+ _("%s cannot be set higher than %s "), \
+ #FIELD, #FIELD_MAX); \
+ goto cleanup; \
+ } \
+ } while (0);
- if (info.write_bytes_sec > info.write_bytes_sec_max) {
- virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("write_bytes_sec "
- "cannot be set higher than its corresponding max
value"));
- goto cleanup;
- }
+ TEST_BLOCK_IOTUNE_MAX_CHECK(total_bytes_sec, total_bytes_sec_max);
+ TEST_BLOCK_IOTUNE_MAX_CHECK(read_bytes_sec, read_bytes_sec_max);
+ TEST_BLOCK_IOTUNE_MAX_CHECK(write_bytes_sec, write_bytes_sec_max);
+ TEST_BLOCK_IOTUNE_MAX_CHECK(total_iops_sec, total_iops_sec_max);
+ TEST_BLOCK_IOTUNE_MAX_CHECK(read_iops_sec, read_iops_sec_max);
+ TEST_BLOCK_IOTUNE_MAX_CHECK(write_iops_sec, write_iops_sec_max);
- if (info.total_iops_sec > info.total_iops_sec_max) {
- virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("total_iops_sec "
- "cannot be set higher than its corresponding max
value"));
- goto cleanup;
- }
-
- if (info.read_iops_sec > info.read_iops_sec_max) {
- virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("read_iops_sec "
- "cannot be set higher than its corresponding max
value"));
- goto cleanup;
- }
-
- if (info.write_iops_sec > info.write_iops_sec_max) {
- virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("write_iops_sec "
- "cannot be set higher than its corresponding max
value"));
- goto cleanup;
- }
+#undef TEST_BLOCK_IOTUNE_MAX_CHECK
if (virDomainDiskSetBlockIOTune(conf_disk, &info) < 0)
goto cleanup;
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
1960
days inactive
1963
days old
5 comments
2 participants
participants (2)
-
Erik Skultety -
Ilias Stamatis