Skip to content

Commit

Permalink
export daos-related envs in soak clush dfuse
Browse files Browse the repository at this point in the history
Skip-build: true

Signed-off-by: Dalton Bohning <dalton.bohning@intel.com>
  • Loading branch information
daltonbohning committed Sep 9, 2024
1 parent 3e31630 commit 856ef88
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/tests/ftest/util/soak_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from mdtest_utils import MdtestCommand
from oclass_utils import extract_redundancy_factor
from pydaos.raw import DaosApiError, DaosSnapshot
from run_utils import run_remote
from run_utils import daos_env_str, run_remote
from test_utils_container import add_container

H_LOCK = threading.Lock()
Expand Down Expand Up @@ -857,7 +857,8 @@ def start_dfuse(self, pool, container, name=None, job_spec=None):
self.soak_log_dir,
self.test_name + "_" + name + "_`hostname -s`_"
"" + "${SLURM_JOB_ID}_" + "daos_dfuse.log")
dfuse_env = f"export D_LOG_FILE_APPEND_PID=1;export D_LOG_MASK=ERR;export D_LOG_FILE={dfuselog}"
dfuse_env = daos_env_str(os.environ) + \
f"export D_LOG_FILE_APPEND_PID=1;export D_LOG_MASK=ERR;export D_LOG_FILE={dfuselog}"
module_load = f"module use {self.mpi_module_use};module load {self.mpi_module}"

dfuse_start_cmds = [
Expand Down Expand Up @@ -886,9 +887,10 @@ def stop_dfuse(dfuse, vol=False):
"do daos container destroy --path={0}/\"$file\" ; done".format(
dfuse.mount_dir.value)])

dfuse_env = daos_env_str(os.environ)
dfuse_stop_cmds.extend([
"clush -S -w $SLURM_JOB_NODELIST \"fusermount3 -uz {0}\"".format(dfuse.mount_dir.value),
"clush -S -w $SLURM_JOB_NODELIST \"rm -rf {0}\"".format(dfuse.mount_dir.value)])
f'clush -S -w $SLURM_JOB_NODELIST "{dfuse_env}fusermount3 -uz {dfuse.mount_dir.value}"',
f'clush -S -w $SLURM_JOB_NODELIST "rm -rf {dfuse.mount_dir.value}"'])
return dfuse_stop_cmds


Expand Down

0 comments on commit 856ef88

Please sign in to comment.