From deb7c8b9b59c36bf3e80b70858ea8138a8682cfe Mon Sep 17 00:00:00 2001 From: ddomingu Date: Fri, 3 Jan 2025 12:48:29 +0100 Subject: [PATCH] Fix problem when running VM fio workloads using pvcvolumemode=Block (#835) --- roles/fio_distributed/templates/configmap.yml.j2 | 8 ++++++-- roles/fio_distributed/templates/prefill-configmap.yml.j2 | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/roles/fio_distributed/templates/configmap.yml.j2 b/roles/fio_distributed/templates/configmap.yml.j2 index 95d15b4f7..d39af63b6 100644 --- a/roles/fio_distributed/templates/configmap.yml.j2 +++ b/roles/fio_distributed/templates/configmap.yml.j2 @@ -10,7 +10,9 @@ data: {% if workload_args.prefill is defined and workload_args.prefill is sameas true %} fiojob-prefill: | [global] -{% if workload_args.pvcvolumemode is defined and workload_args.pvcvolumemode == "Block" %} +{% if workload_args.kind is defined and workload_args.kind == "vm" %} + directory={{fio_path}} +{% elif workload_args.pvcvolumemode is defined and workload_args.pvcvolumemode == "Block" %} filename={{fio_path}} {% else %} directory={{fio_path}} @@ -50,7 +52,9 @@ data: {% for job in workload_args.jobs %} fiojob-{{job}}-{{i}}-{{numjobs}}: | [global] -{% if workload_args.pvcvolumemode is defined and workload_args.pvcvolumemode == "Block" %} +{% if workload_args.kind is defined and workload_args.kind == "vm" %} + directory={{fio_path}} +{% elif workload_args.pvcvolumemode is defined and workload_args.pvcvolumemode == "Block" %} filename={{fio_path}} {% else %} directory={{fio_path}} diff --git a/roles/fio_distributed/templates/prefill-configmap.yml.j2 b/roles/fio_distributed/templates/prefill-configmap.yml.j2 index bd368cb54..fddc62cdb 100644 --- a/roles/fio_distributed/templates/prefill-configmap.yml.j2 +++ b/roles/fio_distributed/templates/prefill-configmap.yml.j2 @@ -10,7 +10,9 @@ data: {% if workload_args.prefill is defined and workload_args.prefill is sameas true %} fiojob-prefill: | [global] -{% if workload_args.pvcvolumemode is defined and workload_args.pvcvolumemode == "Block" %} +{% if workload_args.kind is defined and workload_args.kind == "vm" %} + directory={{fio_path}} +{% elif workload_args.pvcvolumemode is defined and workload_args.pvcvolumemode == "Block" %} filename={{fio_path}} {% else %} directory={{fio_path}}