DAOS-15960 test: Makito's version of io_sys_admin test improvement

src/tests/ftest/deployment/io_sys_admin.yaml

@@ -44,7 +44,7 @@ container_3:
   type: POSIX
   properties: cksum:crc16,cksum_size:16384,srv_cksum:on
   control_method: daos
-  oclass: EC_2P2GX
+  oclass: EC_16P2GX
 
 pool:
   size: 40%
@@ -60,35 +60,38 @@ container_set_owner:
 
 largefilecount:
   api:
-    - MPIIO
-    - POSIX
-    - HDF5
+    # We want to isolate the issues in HDF5 and HDF5-VOL, so comment out MPIIO, POSIX, and DFS.
+    #- MPIIO
+    #- POSIX
+    #- HDF5
     - HDF5-VOL
-    - DFS
+    #- DFS
   object_class:
     ior_oclass:          # Run once with SX and then with EC_16P2GX
       - SX
-      - EC_2P1GX
+      - EC_16P2GX        # Makito updated
     mdtest_oclass:       # Run once with S1 and then with EC_16P2G1
       - S1
-      - EC_2P1G1
+      - EC_16P2G1        # Makito updated
 ior:
   client_processes:
-    ppn: 30
+    ppn: 104
   dfs_destroy: False
-  flags: "-v -D 300 -W -w -k"
+  # 8/7: Removed -D 300
+  flags: -v -W -w -k
   test_file: daos:testFile
   repetitions: 1
   signature: 123
   transfer_size: '1Mib'
-  block_size: '1Mib'
+  # 8/1: 2Gib worked.
+  block_size: '2Gib'
 dfuse:
   disable_caching: True
 
 mdtest:
   client_processes:
-    ppn: 30
-  num_of_files_dirs: 100      # creating total of 1M files
+    ppn: 104
+  num_of_files_dirs: 1000      # creating total of 1M files
   test_dir: "/"
   iteration: 1
   dfs_destroy: False
@@ -107,8 +110,8 @@ hdf5_vol:
 
 io_sys_admin:
   steps_to_run:
-    pool_create_ownership: True
-    storage_system_query: True
+    pool_create_ownership: False
+    storage_system_query: False
     io: True
-    snapshot: True
-    datamover: True
+    snapshot: False
+    datamover: False

src/tests/ftest/util/file_count_test_base.py

@@ -76,6 +76,7 @@
         intercept = os.path.join(self.prefix, 'lib64', 'libpil4dfs.so')
         ior_oclass = self.params.get("ior_oclass", '/run/largefilecount/object_class/*')
         mdtest_oclass = self.params.get("mdtest_oclass", '/run/largefilecount/object_class/*')
+        #cont_props = self.params.get("properties", '/run/container/*')
 
         # create pool
         self.add_pool(connect=False)

src/tests/ftest/util/mdtest_test_base.py

@@ -69,13 +69,15 @@ def get_mdtest_container(self, pool):
             params['dir_oclass'] = self.mdtest_cmd.dfs_dir_oclass.value
         return self.get_container(pool, **params)
 
-    def execute_mdtest(self, out_queue=None, display_space=True, job_manager=None):
+    def execute_mdtest(self, out_queue=None, display_space=True, job_manager=None,
+                       intercept=None):
         """Runner method for Mdtest.
 
         Args:
             out_queue (queue, optional): Pass any exceptions in a queue. Defaults to None.
             display_space (bool, optional): Whether to display the pool space. Defaults to True.
             job_manager (JobManager, optional): job manager used to run mdtest. Defaults to None.
+            intercept (default None): path to intercept library
 
         Returns:
             object: result of job manager run
@@ -102,7 +104,8 @@ def execute_mdtest(self, out_queue=None, display_space=True, job_manager=None):
 
         # Run Mdtest
         out = self.run_mdtest(
-            job_manager, self.processes, display_space=display_space, out_queue=out_queue)
+            job_manager, self.processes, display_space=display_space, out_queue=out_queue,
+            intercept=intercept)
 
         if self.subprocess:
             return out
@@ -134,7 +137,8 @@ def get_mdtest_job_manager_command(self, mpi_type):
             manager = get_job_manager(self, "Orterun", self.mdtest_cmd, self.subprocess)
         return manager
 
-    def run_mdtest(self, manager, processes, display_space=True, pool=None, out_queue=None):
+    def run_mdtest(self, manager, processes, display_space=True, pool=None, out_queue=None,
+                   intercept=None):
         """Run the Mdtest command.
 
         Args:
@@ -150,6 +154,10 @@ def run_mdtest(self, manager, processes, display_space=True, pool=None, out_queu
         env = self.mdtest_cmd.get_default_env(str(manager), self.client_log)
         manager.assign_hosts(self.hostlist_clients, self.workdir, self.hostfile_clients_slots)
         # Pass only processes or ppn to be compatible with previous behavior
+        if intercept:
+            env['LD_PRELOAD'] = intercept
+            if 'D_IL_REPORT' not in env:
+                env['D_IL_REPORT'] = '1'
         if self.ppn is not None:
             manager.assign_processes(ppn=self.ppn)
         else: