DAOS-15650 test: Change soak dfuse mount dir names (#14164)

Signed-off-by: Maureen Jean <maureen.jean@intel.com>
daos-stack · Apr 17, 2024 · a3fa6c5 · a3fa6c5
1 parent 7bf4d9c
commit a3fa6c5
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 33 deletions.
diff --git a/src/tests/ftest/soak/faults.yaml b/src/tests/ftest/soak/faults.yaml
@@ -120,7 +120,7 @@ ior_faults:
   dfs_oclass:
     - ["EC_2P1GX", "RP_2GX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/ior/"
+    mount_dir: "/tmp/soak_dfuse_ior/"
     disable_caching: true
 hdf5_vol:
   plugin_path: "/usr/lib64/mpich/lib"

diff --git a/src/tests/ftest/soak/harassers.yaml b/src/tests/ftest/soak/harassers.yaml
@@ -141,7 +141,7 @@ ior_harasser:
     - ["EC_2P1GX", "RP_2GX"]
     - ["EC_4P2GX", "RP_3GX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/ior"
+    mount_dir: "/tmp/soak_dfuse_ior"
     disable_caching: true
 fio_harasser:
   api:
@@ -151,7 +151,7 @@ fio_harasser:
     - global
     - test
   global:
-    directory: "/tmp/daos_dfuse/fio/"
+    directory: "/tmp/soak_dfuse_fio/"
     ioengine: 'libaio'
     thread: 1
     group_reporting: 1
@@ -173,7 +173,7 @@ fio_harasser:
       - ["EC_2P1GX", "RP_2GX"]
       - ["EC_4P2GX", "RP_3GX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/fio/"
+    mount_dir: "/tmp/soak_dfuse_fio/"
     disable_caching: true
 mdtest_harasser:
   # maximum timeout for a single job in test in minutes
@@ -205,7 +205,7 @@ mdtest_harasser:
     - ["EC_4P2G1", "RP_3G1"]
   dfs_destroy: false
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/mdtest/"
+    mount_dir: "/tmp/soak_dfuse_mdtest/"
     disable_caching: true
 hdf5_vol:
   plugin_path: "/usr/lib64/mpich/lib"

diff --git a/src/tests/ftest/soak/smoke.yaml b/src/tests/ftest/soak/smoke.yaml
@@ -120,7 +120,7 @@ ior_smoke:
   dfs_oclass:
     - ["EC_2P1GX", "RP_2GX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/ior/"
+    mount_dir: "/tmp/soak_dfuse_ior/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'
@@ -134,7 +134,7 @@ fio_smoke:
     - global
     - test
   global:
-    directory: "/tmp/daos_dfuse/fio/"
+    directory: "/tmp/soak_dfuse_fio/"
     ioengine: 'libaio'
     thread: 1
     group_reporting: 1
@@ -155,7 +155,7 @@ fio_smoke:
     oclass:
       - ["EC_2P1GX", "RP_2GX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/fio/"
+    mount_dir: "/tmp/soak_dfuse_fio/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'
@@ -172,9 +172,9 @@ vpic_smoke:
     - POSIX
     - POSIX-LIBIOIL
     - POSIX-LIBPIL4DFS
-  workdir: "/tmp/daos_dfuse/vpic/"
+  workdir: "/tmp/soak_dfuse_vpic/"
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/vpic/"
+    mount_dir: "/tmp/soak_dfuse_vpic/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'
@@ -191,9 +191,9 @@ lammps_smoke:
     - POSIX
     - POSIX-LIBIOIL
     - POSIX-LIBPIL4DFS
-  workdir: "/tmp/daos_dfuse/lammps/"
+  workdir: "/tmp/soak_dfuse_lammps/"
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/lammps/"
+    mount_dir: "/tmp/soak_dfuse_lammps/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'
@@ -226,7 +226,7 @@ mdtest_smoke:
     - ["EC_2P1G1", "RP_2G1"]
   dfs_destroy: false
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/mdtest/"
+    mount_dir: "/tmp/soak_dfuse_mdtest/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'
@@ -250,7 +250,7 @@ macsio_smoke:
   oclass:
     - ["EC_2P1GX", "RP_2GX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/macsio/"
+    mount_dir: "/tmp/soak_dfuse_macsio/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'

diff --git a/src/tests/ftest/soak/stress.yaml b/src/tests/ftest/soak/stress.yaml
@@ -134,7 +134,7 @@ ior_stress:
     #  - ["EC_8P2G1", "RP_3GX"]
     #  - ["EC_16P2GX", "RP_3GX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/ior/"
+    mount_dir: "/tmp/soak_dfuse_ior/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'
@@ -149,7 +149,7 @@ fio_stress:
     - test
   global:
     create_serialize: 0
-    directory: "/tmp/daos_dfuse/fio/"
+    directory: "/tmp/soak_dfuse_fio/"
     ioengine: 'libaio'
     thread: 1
     group_reporting: 1
@@ -176,7 +176,7 @@ fio_stress:
       #  - ["EC_8P2G1", "RP_3GX"]
       #  - ["EC_16P2GX", "RP_3GX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/fio/"
+    mount_dir: "/tmp/soak_dfuse_fio/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'
@@ -194,9 +194,9 @@ vpic_stress:
     - POSIX
     - POSIX-LIBIOIL
     - POSIX-LIBPIL4DFS
-  workdir: "/tmp/daos_dfuse/vpic/"
+  workdir: "/tmp/soak_dfuse_vpic/"
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/vpic/"
+    mount_dir: "/tmp/soak_dfuse_vpic/"
     disable_caching: true
   oclass:
     - ["EC_2P1GX", "RP_2GX"]
@@ -211,9 +211,9 @@ lammps_stress:
     - POSIX
     - POSIX-LIBIOIL
     - POSIX-LIBPIL4DFS
-  workdir: "/tmp/daos_dfuse/lammps/"
+  workdir: "/tmp/soak_dfuse_lammps/"
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/lammps/"
+    mount_dir: "/tmp/soak_dfuse_lammps/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'
@@ -254,7 +254,7 @@ mdtest_stress:
     #  - ["EC_16P2G1", "RP_3G1"]
   dfs_destroy: false
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/mdtest/"
+    mount_dir: "/tmp/soak_dfuse_mdtest/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'
@@ -285,7 +285,7 @@ macsio_stress:
     #  - ["EC_8P2G1", "RP_3GX"]
     #  - ["EC_16P2GX", "RP_3GX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/macsio/"
+    mount_dir: "/tmp/soak_dfuse_macsio/"
     disable_caching: true
     thread_count: 8
     cores: '0-7'

diff --git a/src/tests/ftest/soak/stress_2h.yaml b/src/tests/ftest/soak/stress_2h.yaml
@@ -97,7 +97,7 @@ ior_stress:
   dfs_oclass:
     - ["SX","SX"]
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/ior/"
+    mount_dir: "/tmp/soak_dfuse_ior/"
     disable_caching: true
 mdtest_stress:
   # maximum timeout for a single job in test in minutes
@@ -124,7 +124,7 @@ mdtest_stress:
     - ["S1","S1"]
   dfs_destroy: false
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/mdtest/"
+    mount_dir: "/tmp/soak_dfuse_mdtest/"
     disable_caching: true
 vpic_stress:
   job_timeout: 20
@@ -134,9 +134,9 @@ vpic_stress:
     - 16
   cmdline: "/var/hit/daos/builds/vpic-install/bin/harris.Linux"
   posix: true
-  workdir: "/tmp/daos_dfuse/vpic/"
+  workdir: "/tmp/soak_dfuse_vpic/"
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/vpic/"
+    mount_dir: "/tmp/soak_dfuse_vpic/"
     disable_caching: true
   oclass:
     - ["SX","SX"]
@@ -148,9 +148,9 @@ lammps_stress:
     - 16
   cmdline: "/var/hit/daos/builds/lammps/src/lmp_mpi -i /var/hit/daos/builds/lammps/bench/in.lj"
   posix: true
-  workdir: "/tmp/daos_dfuse/lammps/"
+  workdir: "/tmp/soak_dfuse_lammps/"
   dfuse:
-    mount_dir: "/tmp/daos_dfuse/lammps/"
+    mount_dir: "/tmp/soak_dfuse_lammps/"
     disable_caching: true
   oclass:
     - ["SX","SX"]
diff --git a/src/tests/ftest/util/soak_utils.py b/src/tests/ftest/util/soak_utils.py
@@ -18,7 +18,7 @@
 from command_utils_base import EnvironmentVariables
 from daos_racer_utils import DaosRacerCommand
 from data_mover_utils import DcpCommand, FsCopy
-from dfuse_utils import Dfuse
+from dfuse_utils import get_dfuse
 from dmg_utils import get_storage_query_device_info
 from duns_utils import format_path
 from exception_utils import CommandFailure
@@ -843,10 +843,9 @@ def start_dfuse(self, pool, container, name=None, job_spec=None):
             cmd(list): list of dfuse commands to add to job script
     """
     # Get Dfuse params
-    dfuse = Dfuse(self.hostlist_clients, self.tmp)
-    dfuse.namespace = os.path.join(os.sep, "run", job_spec, "dfuse", "*")
+    namespace = os.path.join(os.sep, "run", job_spec, "dfuse", "*")
+    dfuse = get_dfuse(self, self.hostlist_clients, namespace)
     dfuse.bind_cores = self.params.get("cores", dfuse.namespace, None)
-    dfuse.get_params(self)
     # update dfuse params; mountpoint for each container
     unique = get_random_string(5, self.used)
     self.used.append(unique)