Merge remote-tracking branch 'ups/master' into jxiong/variable_in_loop

src/tests/ftest/container/multiple_delete.py

@@ -1,5 +1,5 @@
 """
-  (C) Copyright 2020-2023 Intel Corporation.
+  (C) Copyright 2020-2024 Intel Corporation.
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 """
@@ -8,8 +8,6 @@
 from general_utils import DaosTestError
 from ior_test_base import IorTestBase
 
-SCM_THRESHOLD = 400000
-
 
 class MultipleContainerDelete(IorTestBase):
     """Test class Description:
@@ -77,13 +75,14 @@ def test_multiple_container_delete(self):
         # since 50 is not divisible by 8, some data would remain in the disk right after
         # the 50th iteration. If we wait for several seconds, that remaining data will be
         # deleted (and we have 198KB left as mentioned above).
+        scm_threshold = self.params.get("scm_threshold", "/run/*")
         for _ in range(5):
             final_scm_fs, _ = self.get_pool_space()
             scm_diff = initial_scm_fs - final_scm_fs
-            if scm_diff <= SCM_THRESHOLD:
+            if scm_diff <= scm_threshold:
                 msg = ("SCM space was recovered. Initial = {}; Final = {}; "
                        "Threshold = {}; (Unit is in byte)").format(
-                           initial_scm_fs, final_scm_fs, SCM_THRESHOLD)
+                           initial_scm_fs, final_scm_fs, scm_threshold)
                 self.log.info(msg)
                 scm_recovered = True
                 break
@@ -92,7 +91,7 @@ def test_multiple_container_delete(self):
         if not scm_recovered:
             msg = ("SCM space wasn't recovered! Initial = {}, Final = {}, "
                    "Threshold = {}; (Unit is in byte.)".format(
-                       initial_scm_fs, final_scm_fs, SCM_THRESHOLD))
+                       initial_scm_fs, final_scm_fs, scm_threshold))
             self.fail(msg)
 
     def get_pool_space(self):

src/tests/ftest/container/multiple_delete.yaml

@@ -47,3 +47,5 @@ ior:
   block_size: 1G
   dfs_oclass: EC_2P2G1
   dfs_dir_oclass: EC_2P2G1
+
+scm_threshold: 1500000

utils/build.config

@@ -9,7 +9,7 @@ isal=v2.30.0
 isal_crypto=v2.23.0
 spdk=v22.01.2
 ofi=v1.22.0
-mercury=v2.4.0rc5
+mercury=v2.4.0
 protobufc=v1.3.3
 ucx=v1.14.1