Skip to content

DAOS-17135 cart: not exclude self when create corpc for IV #16286

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

Closed
Nasf-Fan wants to merge 1 commit into from
Closed

DAOS-17135 cart: not exclude self when create corpc for IV #16286

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
30 changes: 10 additions & 20 deletions src/cart/crt_iv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2210,15 +2210,13 @@ crt_ivsync_rpc_issue(struct crt_ivns_internal *ivns_internal, uint32_t class_id,
crt_iv_comp_cb_t update_comp_cb, void *cb_arg,
void *user_priv, int update_rc)
{
crt_rpc_t *corpc_req = NULL;
struct crt_iv_sync_in *input;
int rc = 0;
bool delay_completion = false;
struct iv_sync_cb_info *iv_sync_cb = NULL;
struct crt_iv_ops *iv_ops;
crt_bulk_t local_bulk = CRT_BULK_NULL;
d_rank_list_t excluded_list;
d_rank_t excluded_ranks[1]; /* Excluding self */
struct crt_iv_sync_in *input;
struct crt_iv_ops *iv_ops;
crt_rpc_t *corpc_req = NULL;
struct iv_sync_cb_info *iv_sync_cb = NULL;
crt_bulk_t local_bulk = CRT_BULK_NULL;
int rc = 0;
bool delay_completion = false;

iv_ops = crt_iv_ops_get(ivns_internal, class_id);
D_ASSERT(iv_ops != NULL);
Expand All @@ -2243,10 +2241,6 @@ crt_ivsync_rpc_issue(struct crt_ivns_internal *ivns_internal, uint32_t class_id,
D_GOTO(exit, rc = -DER_INVAL);
}

/* Exclude self from corpc */
excluded_list.rl_nr = 1;
excluded_list.rl_ranks = excluded_ranks;
excluded_ranks[0] = ivns_internal->cii_grp_priv->gp_self;
/* Perform refresh on local node */
if (sync_type->ivs_event == CRT_IV_SYNC_EVENT_UPDATE)
rc = iv_ops->ivo_on_refresh(ivns_internal, iv_key, 0,
Expand All @@ -2273,13 +2267,9 @@ crt_ivsync_rpc_issue(struct crt_ivns_internal *ivns_internal, uint32_t class_id,
}
}

rc = crt_corpc_req_create(ivns_internal->cii_ctx,
&ivns_internal->cii_grp_priv->gp_pub,
&excluded_list,
CRT_OPC_IV_SYNC,
local_bulk, NULL, 0,
ivns_internal->cii_gns.gn_tree_topo,
&corpc_req);
rc = crt_corpc_req_create(ivns_internal->cii_ctx, &ivns_internal->cii_grp_priv->gp_pub,
NULL, CRT_OPC_IV_SYNC, local_bulk, NULL, 0,
ivns_internal->cii_gns.gn_tree_topo, &corpc_req);
if (rc != 0) {
D_ERROR("crt_corpc_req_create(): "DF_RC"\n", DP_RC(rc));
D_GOTO(exit, rc);
Expand Down
62 changes: 62 additions & 0 deletions src/tests/suite/daos_cr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* (C) Copyright 2023-2024 Intel Corporation.
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -3785,6 +3786,64 @@ cr_maintenance_mode(void **state)
cr_cleanup(arg, &pool, 1);
}

/*
* 1. Exclude rank 0.
* 2. Create pool without inconsistency.
* 3. Start checker without options.
* 4. Query checker, it should be completed instead of being blocked.
* 5. Switch to normal mode and cleanup.
*/
static void
cr_lost_rank0(void **state)
{
test_arg_t *arg = *state;
struct test_pool pool = {0};
struct daos_check_info dci = {0};
int rc;

FAULT_INJECTION_REQUIRED();

print_message("CR29: run CR with rank 0 excluded at the beginning\n");

print_message("CR: excluding the rank 0 ...\n");
rc = dmg_system_exclude_rank(dmg_config_file, 0);
assert_rc_equal(rc, 0);

rc = cr_pool_create(state, &pool, false, TCC_NONE);
assert_rc_equal(rc, 0);

rc = cr_system_stop(false);
assert_rc_equal(rc, 0);

rc = cr_mode_switch(true);
assert_rc_equal(rc, 0);

rc = cr_check_start(TCSF_RESET, 0, NULL, NULL);
assert_rc_equal(rc, 0);

cr_ins_wait(1, &pool.pool_uuid, &dci);

rc = cr_ins_verify(&dci, TCIS_COMPLETED);
assert_rc_equal(rc, 0);

rc = cr_pool_verify(&dci, pool.pool_uuid, TCPS_CHECKED, 0, NULL, NULL, NULL);
assert_rc_equal(rc, 0);

/* Reint the rank for subsequent test. */
rc = cr_rank_reint(0, true);
assert_rc_equal(rc, 0);

rc = cr_mode_switch(false);
assert_rc_equal(rc, 0);

rc = cr_system_start();
assert_rc_equal(rc, 0);

cr_dci_fini(&dci);
cr_cleanup(arg, &pool, 1);
}

/* clang-format off */
static const struct CMUnitTest cr_tests[] = {
{ "CR1: start checker for specified pools",
cr_start_specified, async_disable, test_case_teardown},
Expand Down Expand Up @@ -3842,7 +3901,10 @@ static const struct CMUnitTest cr_tests[] = {
cr_handle_fail_pool2, async_disable, test_case_teardown},
{ "CR28: maintenance mode after dry-run check",
cr_maintenance_mode, async_disable, test_case_teardown},
{ "CR29: run CR with rank 0 excluded at the beginning",
cr_lost_rank0, async_disable, test_case_teardown},
};
/* clang-format on */

static int
cr_setup(void **state)
Expand Down
Loading