Merge branch 'master' into liw/pool-query-out-pad

Features: control pool

Author: liw

src/chk/chk_common.c

@@ -1,6 +1,6 @@
 /**
  * (C) Copyright 2022-2024 Intel Corporation.
- * (C) Copyright 2025 Hewlett Packard Enterprise Development LP
+ * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -1234,6 +1234,20 @@ chk_ins_merge_info(uint32_t *status_dst, uint32_t status_src, uint32_t *phase_ds
 	*status_dst = status_src;
 }
 
+void
+chk_ins_cleanup(struct chk_instance *ins)
+{
+	chk_stop_sched(ins);
+	ins->ci_inited = 0;
+
+	chk_iv_ns_cleanup(&ins->ci_iv_ns);
+
+	if (ins->ci_iv_group != NULL) {
+		crt_group_secondary_destroy(ins->ci_iv_group);
+		ins->ci_iv_group = NULL;
+	}
+}
+
 int
 chk_ins_init(struct chk_instance **p_ins)
 {
@@ -1300,11 +1314,8 @@ chk_ins_fini(struct chk_instance **p_ins)
 	if (ins == NULL)
 		return;
 
-	ins->ci_inited = 0;
-	chk_iv_ns_cleanup(&ins->ci_iv_ns);
-
-	if (ins->ci_iv_group != NULL)
-		crt_group_secondary_destroy(ins->ci_iv_group);
+	D_ASSERT(ins->ci_iv_ns == NULL);
+	D_ASSERT(ins->ci_iv_group == NULL);
 
 	d_rank_list_free(ins->ci_ranks);
 	D_ASSERT(d_list_empty(&ins->ci_dead_ranks));

src/chk/chk_engine.c

@@ -2345,6 +2345,7 @@ chk_engine_start(uint64_t gen, uint32_t rank_nr, d_rank_t *ranks, uint32_t polic
 	if (rc != 0)
 		goto out_stop;
 
+	ins->ci_pause         = 0;
 	ins->ci_sched_running = 1;
 
 	rc = dss_ult_create(chk_engine_sched, ins, DSS_XS_SYS, 0, DSS_DEEP_STACK_SZ,
@@ -2407,6 +2408,8 @@ chk_engine_stop(uint64_t gen, int pool_nr, uuid_t pools[], uint32_t *flags)
 	int			 i;
 	int			 active = false;
 
+	CHK_IS_READY(ins);
+
 	if (gen != 0 && gen != cbk->cb_gen)
 		D_GOTO(log, rc = -DER_NOTAPPLICABLE);
 
@@ -2596,6 +2599,8 @@ chk_engine_query(uint64_t gen, int pool_nr, uuid_t pools[], uint32_t *ins_status
 	int				 rc = 0;
 	int				 i;
 
+	CHK_IS_READY(ins);
+
 	/*
 	 * We will support to check query from new check leader under the case of old leader
 	 * crashed, that may have different check generation. So do not check "cb_gen" here,
@@ -2648,6 +2653,8 @@ chk_engine_mark_rank_dead(uint64_t gen, d_rank_t rank, uint32_t version)
 	d_rank_list_t		*rank_list = NULL;
 	int			 rc = 0;
 
+	CHK_IS_READY(ins);
+
 	if (cbk->cb_gen != gen)
 		D_GOTO(out, rc = -DER_NOTAPPLICABLE);
 
@@ -2745,6 +2752,8 @@ chk_engine_act(uint64_t gen, uint64_t seq, uint32_t act)
 	struct chk_instance *ins = chk_engine;
 	int                  rc;
 
+	CHK_IS_READY(ins);
+
 	if (ins->ci_bk.cb_gen != gen)
 		D_GOTO(out, rc = -DER_NOTAPPLICABLE);
 
@@ -2874,6 +2883,8 @@ chk_engine_cont_list(uint64_t gen, uuid_t pool_uuid, uuid_t **conts, uint32_t *c
 	int				 i = 0;
 	int				 rc = 0;
 
+	CHK_IS_READY(ins);
+
 	if (cbk->cb_gen != gen)
 		D_GOTO(out, rc = -DER_NOTAPPLICABLE);
 
@@ -2929,6 +2940,8 @@ chk_engine_pool_start(uint64_t gen, uuid_t uuid, uint32_t phase, uint32_t flags)
 	d_iov_t			 kiov;
 	int			 rc;
 
+	CHK_IS_READY(ins);
+
 	if (ins->ci_bk.cb_ins_status != CHK__CHECK_INST_STATUS__CIS_RUNNING)
 		D_GOTO(out, rc = -DER_SHUTDOWN);
 
@@ -3047,6 +3060,8 @@ chk_engine_pool_mbs(uint64_t gen, uuid_t uuid, uint32_t phase, const char *label
 	int				 rc;
 	int				 i;
 
+	CHK_IS_READY(ins);
+
 	if (ins->ci_bk.cb_ins_status != CHK__CHECK_INST_STATUS__CIS_RUNNING)
 		D_GOTO(out, rc = -DER_SHUTDOWN);
 
@@ -3158,6 +3173,8 @@ chk_engine_set_policy(uint64_t gen, uint32_t policy_nr, struct chk_policy *polic
 	struct chk_property *prop = &ins->ci_prop;
 	int                  rc   = 0;
 
+	CHK_IS_READY(ins);
+
 	/* Do nothing if no (engine) check instance is running. */
 	if (cbk->cb_magic != CHK_BK_MAGIC_ENGINE || cbk->cb_gen != gen ||
 	    cbk->cb_ins_status != CHK__CHECK_INST_STATUS__CIS_RUNNING)
@@ -3295,6 +3312,8 @@ chk_engine_notify(struct chk_iv *iv)
 	struct chk_pool_rec	*cpr;
 	int			 rc = 0;
 
+	CHK_IS_READY(ins);
+
 	if (cbk->cb_gen != iv->ci_gen)
 		D_GOTO(out, rc = -DER_NOTAPPLICABLE);
 
@@ -3512,31 +3531,16 @@ chk_engine_rejoin(void *args)
 			 DF_ENGINE" rejoin on rank %u with iv "DF_UUIDF": "DF_RC"\n",
 			 DP_ENGINE(ins), myrank, DP_UUID(cbk->cb_iv_uuid), DP_RC(rc));
 	ins->ci_rejoining = 0;
-	ins->ci_starting = 0;
-	ins->ci_inited = 1;
-}
-
-void
-chk_engine_pause(void)
-{
-	struct chk_instance	*ins = chk_engine;
-
-	chk_stop_sched(ins);
-	D_ASSERT(d_list_empty(&ins->ci_pool_list));
+	ins->ci_starting  = 0;
 }
 
 int
-chk_engine_init(void)
+chk_engine_setup(void)
 {
-	struct chk_traverse_pools_args	 ctpa = { 0 };
-	struct chk_bookmark		*cbk;
-	int				 rc;
-
-	rc = chk_ins_init(&chk_engine);
-	if (rc != 0)
-		goto fini;
-
-	chk_report_seq_init(chk_engine);
+	struct chk_instance           *ins  = chk_engine;
+	struct chk_bookmark           *cbk  = &ins->ci_bk;
+	struct chk_traverse_pools_args ctpa = {0};
+	int                            rc;
 
 	/*
 	 * DAOS global consistency check depends on all related engines' local
@@ -3545,7 +3549,6 @@ chk_engine_init(void)
 	 * related local inconsistency firstly.
 	 */
 
-	cbk = &chk_engine->ci_bk;
 	rc = chk_bk_fetch_engine(cbk);
 	if (rc == -DER_NONEXIST)
 		goto prop;
@@ -3569,37 +3572,46 @@ chk_engine_init(void)
 		cbk->cb_time.ct_stop_time = time(NULL);
 		rc = chk_bk_update_engine(cbk);
 		if (rc != 0) {
-			D_ERROR(DF_ENGINE" failed to reset status as 'PAUSED': "DF_RC"\n",
-				DP_ENGINE(chk_engine), DP_RC(rc));
+			D_ERROR(DF_ENGINE " failed to reset status as 'PAUSED': " DF_RC "\n",
+				DP_ENGINE(ins), DP_RC(rc));
 			goto fini;
 		}
 
 		ctpa.ctpa_gen = cbk->cb_gen;
-		ctpa.ctpa_ins = chk_engine;
+		ctpa.ctpa_ins = ins;
 		rc            = chk_traverse_pools(chk_pools_pause_cb, &ctpa);
 		/*
 		 * Failed to reset pool status will not affect next check start, so it is not fatal,
 		 * but related check query result may be confused for user.
 		 */
 		if (rc != 0)
-			D_WARN(DF_ENGINE" failed to reset pools status as 'PAUSED': "DF_RC"\n",
-			       DP_ENGINE(chk_engine), DP_RC(rc));
+			D_WARN(DF_ENGINE " failed to reset pools status as 'PAUSED': " DF_RC "\n",
+			       DP_ENGINE(ins), DP_RC(rc));
 	}
 
 prop:
-	rc = chk_prop_fetch(&chk_engine->ci_prop, &chk_engine->ci_ranks);
+	rc = chk_prop_fetch(&ins->ci_prop, &ins->ci_ranks);
 	if (rc == -DER_NONEXIST)
 		rc = 0;
 fini:
-	if (rc != 0)
-		chk_ins_fini(&chk_engine);
+	if (rc != 0) {
+		chk_ins_fini(&ins);
+	} else {
+		chk_report_seq_init(ins);
+		ins->ci_inited = 1;
+		ins->ci_pause  = 0;
+	}
+
 	return rc;
 }
 
 void
-chk_engine_fini(void)
+chk_engine_cleanup(void)
 {
-	chk_ins_fini(&chk_engine);
+	struct chk_instance *ins = chk_engine;
+
+	chk_ins_cleanup(ins);
+	D_ASSERT(d_list_empty(&ins->ci_pool_list));
 }
 
 int
@@ -3609,6 +3621,8 @@ chk_engine_pool_stop(uuid_t pool_uuid, bool destroy)
 	uint32_t	phase;
 	int		rc = 0;
 
+	CHK_IS_READY(chk_engine);
+
 	if (destroy) {
 		status = CHK__CHECK_POOL_STATUS__CPS_CHECKED;
 		phase = CHK__CHECK_SCAN_PHASE__CSP_DONE;
@@ -3624,3 +3638,15 @@ chk_engine_pool_stop(uuid_t pool_uuid, bool destroy)
 
 	return rc;
 }
+
+int
+chk_engine_init(void)
+{
+	return chk_ins_init(&chk_engine);
+}
+
+void
+chk_engine_fini(void)
+{
+	chk_ins_fini(&chk_engine);
+}

src/chk/chk_internal.h

@@ -771,6 +771,8 @@ uint32_t chk_pool_merge_status(uint32_t status_a, uint32_t status_b);
 void chk_ins_merge_info(uint32_t *status_dst, uint32_t status_src, uint32_t *phase_dst,
 			uint32_t phase_src, uint64_t *gen_dst, uint64_t gen_src);
 
+void chk_ins_cleanup(struct chk_instance *ins);
+
 int chk_ins_init(struct chk_instance **p_ins);
 
 void chk_ins_fini(struct chk_instance **p_ins);
@@ -806,7 +808,9 @@ int chk_engine_notify(struct chk_iv *iv);
 
 void chk_engine_rejoin(void *args);
 
-void chk_engine_pause(void);
+int chk_engine_setup(void);
+
+void chk_engine_cleanup(void);
 
 int chk_engine_init(void);
 
@@ -833,7 +837,9 @@ int chk_leader_notify(struct chk_iv *iv);
 int chk_leader_rejoin(uint64_t gen, d_rank_t rank, uuid_t iv_uuid, uint32_t *flags, int *pool_nr,
 		      uuid_t **pools);
 
-void chk_leader_pause(void);
+int chk_leader_setup(void);
+
+void chk_leader_cleanup(void);
 
 int chk_leader_init(void);
 
@@ -912,9 +918,16 @@ int chk_prop_update(struct chk_property *cpp, d_rank_list_t *rank_list);
 
 int chk_traverse_pools(sys_db_trav_cb_t cb, void *args);
 
-void chk_vos_init(void);
+void chk_vos_setup(void);
+
+void chk_vos_cleanup(void);
+
+#define CHK_IS_READY(ins)                                                       \
+	do {                                                                    \
+		if (unlikely((ins)->ci_inited == 0))                            \
+			return -DER_UNINIT;                                     \
+	} while (0)
 
-void chk_vos_fini(void);
 /* clang-format on */
 
 static inline bool
@@ -1228,7 +1241,9 @@ chk_stop_sched(struct chk_instance *ins)
 static inline int
 chk_ins_can_start(struct chk_instance *ins)
 {
-	if (unlikely(!ins->ci_inited))
+	CHK_IS_READY(ins);
+
+	if (!ins->ci_is_leader && ins->ci_rejoining)
 		return -DER_AGAIN;
 
 	if (ins->ci_starting)