DAOS-15084 include: reorder new add DBTREE_CLASS to avoid merge conflict

Also increase timeout threshold to avoid CR tests timeout under hardware
with relative slow MD-on-SSD.

Signed-off-by: Fan Yong <fan.yong@intel.com>

Author: Nasf-Fan

src/include/daos/btree.h

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2016-2023 Intel Corporation.
+ * (C) Copyright 2016-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -653,8 +653,8 @@ enum {
 	DBTREE_VOS_BEGIN	= 10,
 	DBTREE_VOS_END		= DBTREE_VOS_BEGIN + 9,
 	DBTREE_DSM_BEGIN	= 20,
-	DBTREE_DSM_END		= DBTREE_DSM_BEGIN + 9,
-	DBTREE_SMD_BEGIN	= 30,
+	DBTREE_DSM_END		= DBTREE_DSM_BEGIN + 19,
+	DBTREE_SMD_BEGIN	= 40,
 	DBTREE_SMD_END		= DBTREE_SMD_BEGIN + 9,
 };
 

src/include/daos/btree_class.h

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2016-2022 Intel Corporation.
+ * (C) Copyright 2016-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -93,38 +93,44 @@ extern btr_ops_t dbtree_recx_ops;
  */
 #define DBTREE_CLASS_DTX_CF (DBTREE_DSM_BEGIN + 6)
 
-/**
- * The key is dtx_cos_key: oid + dkey_hash
- */
-#define DBTREE_CLASS_DTX_COS (DBTREE_DSM_BEGIN + 7)
-
-/** Integer-fixed-value pairs
+/*
+ * NOTE: unorder new added DBTREE_CLASS for CHK module to avoid merge conflict.
+ *	 That will be adjusted after landing CR patch to master.
  *
- *  Each key is uint64_t integer, values have fixed size for
- *  a given key.  Keys ordered numerically.
+ *	 'DBTREE_DSM_BEGIN + 9' is reserved for collective operation logic.
  */
-#define DBTREE_CLASS_IFV     (DBTREE_DSM_BEGIN + 8)
 
 /**
  * DAOS check pool tree, the key is pool uuid
  */
-#define DBTREE_CLASS_CHK_POOL (DBTREE_DSM_BEGIN + 9)
+#define DBTREE_CLASS_CHK_POOL (DBTREE_DSM_BEGIN + 10)
 
 /**
  * DAOS check rank tree, the key is rank ID
  */
-#define DBTREE_CLASS_CHK_RANK (DBTREE_DSM_BEGIN + 10)
+#define DBTREE_CLASS_CHK_RANK (DBTREE_DSM_BEGIN + 11)
 
 /**
  * DAOS check pending action tree, the key is 64-bit sequence
  */
-#define DBTREE_CLASS_CHK_PA (DBTREE_DSM_BEGIN + 11)
+#define DBTREE_CLASS_CHK_PA (DBTREE_DSM_BEGIN + 12)
 
 /**
  * DAOS check container tree, the key is container uuid
  */
-#define DBTREE_CLASS_CHK_CONT (DBTREE_DSM_BEGIN + 12)
+#define DBTREE_CLASS_CHK_CONT (DBTREE_DSM_BEGIN + 13)
+
+/**
+ * The key is dtx_cos_key: oid + dkey_hash
+ */
+#define DBTREE_CLASS_DTX_COS (DBTREE_DSM_BEGIN + 7)
 
+/** Integer-fixed-value pairs
+ *
+ *  Each key is uint64_t integer, values have fixed size for
+ *  a given key.  Keys ordered numerically.
+ */
+#define DBTREE_CLASS_IFV     (DBTREE_DSM_BEGIN + 8)
 extern btr_ops_t dbtree_ifv_ops;
 
 #endif /* __DAOS_SRV_BTREE_CLASS_H__ */

src/tests/ftest/daos_test/suite.yaml

@@ -9,7 +9,7 @@ timeout: 600
 timeouts:
   test_daos_degraded_mode: 450
   test_daos_management: 110
-  test_daos_cat_recovery: 3600
+  test_daos_cat_recovery: 5400
   test_daos_pool: 180
   test_daos_container: 510
   test_daos_epoch: 125