Merge branch 'master' into wangdi/daos_14884

Features: pool Required-githooks: true
daos-stack · Jan 18, 2024 · 999f668 · 999f668
2 parents 9a8da27 + da658ad
commit 999f668
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/rpm-build-and-test.yml b/.github/workflows/rpm-build-and-test.yml
@@ -5,10 +5,10 @@ env:
   #       build is done on the lowest version and test on the highest with a "sanity test"
   #       stage done on all versions in the list ecept the highest
   EL8_BUILD_VERSION: 8.6
-  EL8_VERSION: 8
+  EL8_VERSION: 8.8
   EL9_BUILD_VERSION: 9
   EL9_VERSION: 9
-  LEAP15_VERSION: 15.4
+  LEAP15_VERSION: 15.5
 
 on:
   workflow_dispatch:

diff --git a/ci/functional/test_main.sh b/ci/functional/test_main.sh
@@ -45,7 +45,7 @@ test_cluster() {
         FIRST_NODE=${first_node}                        \
         TEST_RPMS=${TEST_RPMS}                          \
         NODELIST=${tnodes}                              \
-        BUILD_URL=\"$BUILD_URL\"                        \
+        BUILD_URL=\"${BUILD_URL:-Unknown in GHA}\"      \
         STAGE_NAME=\"$STAGE_NAME\"                      \
         $(cat ci/functional/test_main_prep_node.sh)"
 }

diff --git a/src/rebuild/scan.c b/src/rebuild/scan.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2017-2023 Intel Corporation.
+ * (C) Copyright 2017-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -882,12 +882,13 @@ rebuild_container_scan_cb(daos_handle_t ih, vos_iter_entry_t *entry,
 	}
 
 	/* Wait for EC aggregation to finish. NB: migrate needs to wait for EC aggregation to finish */
-	while (cont_child->sc_ec_agg_active) {
+	while (cont_child->sc_ec_agg_active &&
+	       rpt->rt_rebuild_op != RB_OP_RECLAIM &&
+	       rpt->rt_rebuild_op != RB_OP_FAIL_RECLAIM) {
 		D_ASSERTF(rpt->rt_pool->sp_rebuilding >= 0, DF_UUID" rebuilding %d\n",
 			  DP_UUID(rpt->rt_pool_uuid), rpt->rt_pool->sp_rebuilding);
 			/* Wait for EC aggregation to abort before discard the object */
-		D_DEBUG(DB_REBUILD, DF_UUID" wait for ec agg abort.\n",
-			DP_UUID(entry->ie_couuid));
+		D_INFO(DF_UUID" wait for ec agg abort.\n", DP_UUID(entry->ie_couuid));
 		dss_sleep(1000);
 		if (rpt->rt_abort || rpt->rt_finishing) {
 			D_DEBUG(DB_REBUILD, DF_CONT" rebuild op %s ver %u abort %u/%u.\n",

diff --git a/src/tests/ftest/daos_test/suite.yaml b/src/tests/ftest/daos_test/suite.yaml
@@ -191,3 +191,5 @@ daos_tests:
     test_daos_extend_simple: 5
     test_daos_rebuild_ec: 43
     test_daos_degraded_ec: 29
+  crt_timeout:
+    test_daos_oid_allocator: 60
diff --git a/src/tests/ftest/erasurecode/online_rebuild_single.yaml b/src/tests/ftest/erasurecode/online_rebuild_single.yaml
@@ -30,9 +30,10 @@ server_config:
       storage: auto
 pool:
   size: 93%
-  svcn: 1
+  svcn: 5
   control_method: dmg
   pool_query_timeout: 30
+  properties: rd_fac:2
 container:
   type: POSIX
   control_method: API

diff --git a/src/tests/ftest/util/daos_core_base.py b/src/tests/ftest/util/daos_core_base.py
@@ -1,5 +1,5 @@
 """
-  (C) Copyright 2018-2023 Intel Corporation.
+  (C) Copyright 2018-2024 Intel Corporation.
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 """
@@ -96,6 +96,14 @@ def start_server_managers(self, force=False):
                         ["=".join(items) for items in list(env_dict.items())]
                     )
 
+        # Update any other server settings unique to this test method
+        for setting in ["crt_timeout"]:
+            value = self.get_test_param(setting)
+            if value:
+                for server_mgr in self.server_managers:
+                    for engine_params in server_mgr.manager.job.yaml.engine_params:
+                        engine_params.set_value(setting, value)
+
         # Start the servers
         return super().start_server_managers(force=force)