Skip to content

Commit

Permalink
DAOS-16582 test: do not set working dir for hdf5 vol
Browse files Browse the repository at this point in the history
Do not set the working dir for hdf5 vol to be in the dfuse mount point
since it is not required.

Only keep it for H5 suite tests, which do need to be ran from a
filesystem with xattr support.

Test-tag: MacsioTest DaosVolBigIO DaosVol BasicCheckout IorSmall IoSysAdmin soak_smoke ior
Skip-unit-tests: true
Skip-fault-injection-test: true

Required-githooks: true

Signed-off-by: Dalton Bohning <[email protected]>
  • Loading branch information
daltonbohning committed Sep 24, 2024
1 parent ee09484 commit dfe8ca5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 14 deletions.
8 changes: 2 additions & 6 deletions src/tests/ftest/io/macsio_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def _get_macsio_command(self, pool, cont):

return macsio

def run_macsio(self, macsio, hosts, processes, plugin=None, slots=None, working_dir=None):
def run_macsio(self, macsio, hosts, processes, plugin=None, slots=None):
"""Run the macsio test.
Parameters for the macsio command are obtained from the test yaml file,
Expand All @@ -56,7 +56,6 @@ def run_macsio(self, macsio, hosts, processes, plugin=None, slots=None, working_
processes (int): total number of processes to use to run macsio
plugin (str, optional): plugin path to use with DAOS VOL connector
slots (int, optional): slots per host to specify in the hostfile. Defaults to None.
working_dir (str, optional): working directory. Defaults to None.
Returns:
CmdResult: Object that contains exit status, stdout, and other information.
Expand All @@ -73,7 +72,6 @@ def run_macsio(self, macsio, hosts, processes, plugin=None, slots=None, working_
job_manager.assign_hosts(hosts, self.workdir, slots)
job_manager.assign_processes(processes)
job_manager.assign_environment(env)
job_manager.working_dir.value = working_dir

# Run MACSio
try:
Expand Down Expand Up @@ -159,9 +157,7 @@ def test_macsio_daos_vol(self):
# Run macsio
self.log_step("Running MACSio with DAOS VOL connector")
macsio = self._get_macsio_command(pool, container)
result = self.run_macsio(
macsio, self.hostlist_clients, processes, plugin_path,
working_dir=dfuse.mount_dir.value)
result = self.run_macsio(macsio, self.hostlist_clients, processes, plugin_path)
if not macsio.check_results(result, self.hostlist_clients):
self.fail("MACSio failed")
self.log.info("Test passed")
1 change: 0 additions & 1 deletion src/tests/ftest/util/ior_test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ def run_ior(self, manager, processes, intercept=None, display_space=True,
if plugin_path:
env["HDF5_VOL_CONNECTOR"] = "daos"
env["HDF5_PLUGIN_PATH"] = str(plugin_path)
manager.working_dir.value = self.dfuse.mount_dir.value
manager.assign_hosts(
self.hostlist_clients, self.workdir, self.hostfile_clients_slots)
# Pass only processes or ppn to be compatible with previous behavior
Expand Down
4 changes: 1 addition & 3 deletions src/tests/ftest/util/ior_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -618,9 +618,7 @@ def run(self, pool, container, processes, ppn=None, intercept=None, plugin_path=
if plugin_path:
self.env["HDF5_VOL_CONNECTOR"] = "daos"
self.env["HDF5_PLUGIN_PATH"] = str(plugin_path)
if dfuse:
self.manager.working_dir.value = dfuse.mount_dir.value
else:
if not dfuse:
raise CommandFailure("Undefined 'dfuse' argument; required for 'plugin_path'")

if not self.manager.job.test_file.value:
Expand Down
1 change: 0 additions & 1 deletion src/tests/ftest/util/soak_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,6 @@ def create_macsio_cmdline(self, job_spec, pool, ppn, nodesperjob):
# add envs for HDF5-VOL
env["HDF5_VOL_CONNECTOR"] = "daos"
env["HDF5_PLUGIN_PATH"] = str(plugin_path)
mpirun_cmd.working_dir.update(dfuse.mount_dir.value)
mpirun_cmd.assign_environment(env, True)
mpirun_cmd.ppn.update(ppn)
sbatch_cmds.append(str(mpirun_cmd))
Expand Down
5 changes: 2 additions & 3 deletions src/tests/ftest/util/vol_test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def run_test(self, job_manager, plugin_path, test_repo):
"""
# initialize test specific variables
# test_list = self.params.get("daos_vol_tests", default=[])
testname = self.params.get("testname")
client_processes = self.params.get("client_processes")

Expand All @@ -51,11 +50,11 @@ def run_test(self, job_manager, plugin_path, test_repo):
env["DAOS_POOL"] = pool.identifier
env["DAOS_CONT"] = container.identifier
env["HDF5_VOL_CONNECTOR"] = "daos"
env["HDF5_PLUGIN_PATH"] = "{}".format(plugin_path)
env["HDF5_PLUGIN_PATH"] = plugin_path
job_manager.assign_hosts(self.hostlist_clients)
job_manager.assign_processes(client_processes)
job_manager.assign_environment(env, True)
job_manager.working_dir.value = dfuse.mount_dir.value
job_manager.working_dir.value = dfuse.mount_dir.value # H5 suite needs xattr support

# run VOL Command
self.log_step(f'Running {job_manager.job.command}')
Expand Down

0 comments on commit dfe8ca5

Please sign in to comment.