Skip to content

Commit 31c074f

Browse files
committed
DAOS-16810 test: update fio tests with unique dfuse dir
Update fio tests to use unique dfuse mount directory by letting the framework generate one. Skip-unit-tests: true Skip-fault-injection-test: true Test-tag: fio Signed-off-by: Dalton Bohning <[email protected]>
1 parent e2042f1 commit 31c074f

File tree

8 files changed

+12
-15
lines changed

8 files changed

+12
-15
lines changed

src/tests/ftest/dfuse/fio_pil4dfs_small.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ fio:
4949
- global
5050
- test
5151
global:
52-
directory: "/tmp/daos_dfuse"
5352
ioengine: 'sync'
5453
thread: 1
5554
group_reporting: 1
@@ -75,6 +74,5 @@ fio:
7574
numjobs: 1
7675

7776
dfuse:
78-
mount_dir: "/tmp/daos_dfuse"
7977
thread_count: 8
8078
cores: '0-3'

src/tests/ftest/dfuse/fio_small.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ fio:
4949
- global
5050
- test
5151
global:
52-
directory: "/tmp/daos_dfuse"
5352
ioengine: 'libaio'
5453
thread: 1
5554
group_reporting: 1
@@ -75,7 +74,6 @@ fio:
7574
numjobs: 1
7675

7776
dfuse:
78-
mount_dir: "/tmp/daos_dfuse"
7977
thread_count: 8
8078
eq_count: 2
8179
cores: '0-3'

src/tests/ftest/erasurecode/rebuild_fio.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'''
22
(C) Copyright 2019-2024 Intel Corporation.
3-
(C) Copyright 2025 Hewlett Packard Enterprise Development LP
3+
(C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
44
55
SPDX-License-Identifier: BSD-2-Clause-Patent
66
'''
@@ -42,6 +42,7 @@ def execution(self, rebuild_mode):
4242
container.set_attr(attrs={'dfuse-direct-io-disable': 'on'})
4343
dfuse = get_dfuse(self, self.hostlist_clients)
4444
start_dfuse(self, dfuse, pool, container)
45+
self.fio_cmd.update_directory(dfuse.mount_dir.value)
4546

4647
# Write the Fio data and kill the last server rank if rebuild_mode is on-line
4748
if 'on-line' in rebuild_mode:

src/tests/ftest/erasurecode/rebuild_fio.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ fio:
5353
api: POSIX
5454
test:
5555
numjobs: 10
56-
directory: "/tmp/daos_dfuse"
5756
verify: 'crc32'
5857
verify_pattern: '0xabcdabcd'
5958
do_verify: 1
@@ -68,5 +67,4 @@ fio:
6867
rw_read: 'randrw'
6968

7069
dfuse:
71-
mount_dir: "/tmp/daos_dfuse"
7270
disable_caching: True

src/tests/ftest/erasurecode/truncate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'''
22
(C) Copyright 2019-2024 Intel Corporation.
3-
(C) Copyright 2025 Hewlett Packard Enterprise Development LP
3+
(C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
44
55
SPDX-License-Identifier: BSD-2-Clause-Patent
66
'''

src/tests/ftest/erasurecode/truncate.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ fio:
4747
names:
4848
- test
4949
test:
50-
directory: "/tmp/daos_dfuse"
5150
verify: 'crc32'
5251
verify_pattern: '0xabcdabcd'
5352
do_verify: 1
@@ -58,7 +57,6 @@ fio:
5857
truncate_size: '26214400' # 25Mb
5958

6059
dfuse:
61-
mount_dir: "/tmp/daos_dfuse"
6260
caching: !mux
6361
disable:
6462
disable_caching: true

src/tests/ftest/fault_injection/ec.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ fio:
5454
- global
5555
- test
5656
global:
57-
directory: "/tmp/daos_dfuse"
5857
thread: 1
5958
group_reporting: 1
6059
direct: 1
@@ -66,9 +65,6 @@ fio:
6665
test:
6766
numjobs: 1
6867

69-
dfuse:
70-
mount_dir: "/tmp/daos_dfuse"
71-
7268
faults:
7369
fault_list:
7470
- DAOS_CSUM_CORRUPT_FETCH

src/tests/ftest/util/fio_utils.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""
22
(C) Copyright 2019-2024 Intel Corporation.
3+
(C) Copyright 2026 Hewlett Packard Enterprise Development LP
34
45
SPDX-License-Identifier: BSD-2-Clause-Patent
56
"""
@@ -138,10 +139,17 @@ def update(self, job_name, param_name, value, description=None):
138139
def update_directory(self, directory):
139140
"""Helper method for setting Fio directory command line option.
140141
142+
If "global" job is defined, update global. Otherwise, update all jobs in the list of jobs.
143+
141144
Args:
142145
directory (str): fio directory argument value
143146
"""
144-
self.update("global", "directory", directory, "fio --name=global --directory")
147+
if "global" in self._jobs:
148+
job_names = ["global"]
149+
else:
150+
job_names = self._jobs.keys()
151+
for job_name in job_names:
152+
self.update(job_name, "directory", directory, f"fio --name={job_name} --directory")
145153

146154
@property
147155
def command_with_params(self):

0 commit comments

Comments
 (0)