Skip to content

DAOS-19352 rebuild: refine FAIL_RECLAIM bcast for stop_admin case #18713

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

Open
liuxuezhao wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −6
Open

DAOS-19352 rebuild: refine FAIL_RECLAIM bcast for stop_admin case #18713

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
21 changes: 15 additions & 6 deletions src/rebuild/srv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,7 +1406,7 @@ rebuild_prepare(struct ds_pool *pool, uint32_t rebuild_ver,
static int
rebuild_scan_broadcast(struct ds_pool *pool, struct rebuild_global_pool_tracker *rgt,
struct pool_target_id_list *tgts_failed, uint32_t layout_version,
daos_rebuild_opc_t rebuild_op)
daos_rebuild_opc_t rebuild_op, bool stop_admin, uint32_t orig_rb_ver)
{
struct rebuild_scan_in *rsi;
struct rebuild_scan_out *rso;
Expand Down Expand Up @@ -1456,12 +1456,20 @@ rebuild_scan_broadcast(struct ds_pool *pool, struct rebuild_global_pool_tracker
D_DEBUG(DB_REBUILD, DF_RB " rank %u co_in_ver %u, rebuild_ver %u.\n",
DP_RB_RGT(rgt), up_ranks.rl_ranks[i], dom->do_comp.co_in_ver,
rgt->rgt_rebuild_ver);
if (dom->do_comp.co_in_ver <= rgt->rgt_rebuild_ver)
/* For admin stopped reintegration, FAIL_RECLAIM needs to broadcast
* to reint engines to cleanup space, as following rebuild start will
* not do pool_discard again.
*/
if (dom->do_comp.co_in_ver <= rgt->rgt_rebuild_ver ||
(stop_admin && rebuild_op == RB_OP_FAIL_RECLAIM &&
dom->do_comp.co_in_ver <= orig_rb_ver)) {
continue;
}

D_INFO(DF_RB " bypass UP rank %u co_in_ver %u exceed rebuild_ver %u\n",
D_INFO(DF_RB " bypass UP rank %u co_in_ver %u, rebuild_ver %u, "
"stop_admin %d, rebuild_op %d, orig_rb_ver %d",
DP_RB_RGT(rgt), up_ranks.rl_ranks[i], dom->do_comp.co_in_ver,
rgt->rgt_rebuild_ver);
rgt->rgt_rebuild_ver, stop_admin, rebuild_op, orig_rb_ver);
excluded->rl_ranks[nr++] = up_ranks.rl_ranks[i];
}
excluded->rl_nr = nr;
Expand Down Expand Up @@ -1833,8 +1841,9 @@ rebuild_leader_start(struct ds_pool *pool, struct rebuild_task *task,
D_INFO(DF_RB "\n", DP_RB_RGT(*p_rgt));

/* broadcast scan RPC to all targets */
rc = rebuild_scan_broadcast(pool, *p_rgt, &task->dst_tgts,
task->dst_new_layout_version, task->dst_rebuild_op);
rc = rebuild_scan_broadcast(pool, *p_rgt, &task->dst_tgts, task->dst_new_layout_version,
task->dst_rebuild_op, task->dst_stop_admin,
task->dst_retry_map_ver);
if (rc)
DL_ERROR(rc, DF_RB ": object scan failed", DP_RB_RGT(*p_rgt));
else
Expand Down
Loading