Skip to content

DAOS-17535 chk: misc improvements for CR logic - b26 #17428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Nasf-Fan wants to merge 1 commit into
base: release/2.6
Choose a base branch
from
+560 −411
Draft

DAOS-17535 chk: misc improvements for CR logic - b26 #17428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions src/chk/chk_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,8 +1019,7 @@ chk_pending_destroy(struct chk_pending_rec *cpr)
}

int
chk_prop_prepare(d_rank_t leader, uint32_t flags, int phase,
uint32_t policy_nr, struct chk_policy *policies,
chk_prop_prepare(d_rank_t leader, uint32_t flags, uint32_t policy_nr, struct chk_policy *policies,
d_rank_list_t *ranks, struct chk_property *prop)
{
int rc = 0;
Expand All @@ -1033,11 +1032,8 @@ chk_prop_prepare(d_rank_t leader, uint32_t flags, int phase,
prop->cp_flags &= ~CHK__CHECK_FLAG__CF_FAILOUT;
if (flags & CHK__CHECK_FLAG__CF_NO_AUTO)
prop->cp_flags &= ~CHK__CHECK_FLAG__CF_AUTO;
prop->cp_flags |= flags & ~(CHK__CHECK_FLAG__CF_RESET |
CHK__CHECK_FLAG__CF_ORPHAN_POOL |
CHK__CHECK_FLAG__CF_NO_FAILOUT |
CHK__CHECK_FLAG__CF_NO_AUTO);
prop->cp_phase = phase;
prop->cp_flags |= flags & ~(CHK__CHECK_FLAG__CF_RESET | CHK__CHECK_FLAG__CF_ORPHAN_POOL |
CHK__CHECK_FLAG__CF_NO_FAILOUT | CHK__CHECK_FLAG__CF_NO_AUTO);
if (ranks != NULL)
prop->cp_rank_nr = ranks->rl_nr;

Expand Down Expand Up @@ -1195,12 +1191,7 @@ 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;
}
chk_iv_ns_destroy(ins);
}

int
Expand All @@ -1215,7 +1206,8 @@ chk_ins_init(struct chk_instance **p_ins)
if (ins == NULL)
D_GOTO(out_init, rc = -DER_NOMEM);

ins->ci_sched = ABT_THREAD_NULL;
ins->ci_sched = ABT_THREAD_NULL;
ins->ci_dead_rank_ult = ABT_THREAD_NULL;

ins->ci_rank_hdl = DAOS_HDL_INVAL;
D_INIT_LIST_HEAD(&ins->ci_rank_list);
Expand Down Expand Up @@ -1281,6 +1273,8 @@ chk_ins_fini(struct chk_instance **p_ins)
D_ASSERT(daos_handle_is_inval(ins->ci_pending_hdl));
D_ASSERT(d_list_empty(&ins->ci_pool_shutdown_list));

D_ASSERT(ins->ci_dead_rank_ult == ABT_THREAD_NULL);

if (ins->ci_sched != ABT_THREAD_NULL)
ABT_thread_free(&ins->ci_sched);

Expand Down
Loading
Loading