Skip to content

DAOS-18976 rebuild: bump rebuild gen when leader retry the rebuild #18326

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: release/2.6
Choose a base branch
from
+30 −8
Open

DAOS-18976 rebuild: bump rebuild gen when leader retry the rebuild #18326

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
38 changes: 30 additions & 8 deletions src/rebuild/srv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,9 +527,10 @@ rebuild_tgt_query(struct rebuild_tgt_pool_tracker *rpt,
return rc;
}

void
ds_rebuild_running_query(uuid_t pool_uuid, uint32_t opc, uint32_t *upper_ver,
daos_epoch_t *stable_eph, uint32_t *generation)
static void
ds_rebuild_running_query_adv(uuid_t pool_uuid, uint32_t opc, uint32_t *upper_ver,
daos_epoch_t *stable_eph, uint32_t *generation, uint32_t *leader_rank,
uint64_t *leader_term)
{
struct rebuild_tgt_pool_tracker *rpt;

Expand All @@ -539,6 +540,10 @@ ds_rebuild_running_query(uuid_t pool_uuid, uint32_t opc, uint32_t *upper_ver,
*stable_eph = 0;
if (generation)
*generation = -1;
if (leader_rank)
*leader_rank = -1;
if (leader_term)
*leader_term = -1;
rpt = rpt_lookup(pool_uuid, opc, -1, -1);
if (rpt != NULL && !rpt->rt_global_done && !rpt->rt_abort) {
D_DEBUG(DB_REBUILD, DF_UUID" rebuild %p running eph/ver/gen "DF_X64"/%u/%u\n",
Expand All @@ -550,11 +555,22 @@ ds_rebuild_running_query(uuid_t pool_uuid, uint32_t opc, uint32_t *upper_ver,
*upper_ver = rpt->rt_rebuild_ver;
if (generation)
*generation = rpt->rt_rebuild_gen;
if (leader_rank)
*leader_rank = rpt->rt_leader_rank;
if (leader_term)
*leader_term = rpt->rt_leader_term;
}
if (rpt)
rpt_put(rpt);
}

void
ds_rebuild_running_query(uuid_t pool_uuid, uint32_t opc, uint32_t *upper_ver,
daos_epoch_t *stable_eph, uint32_t *generation)
{
ds_rebuild_running_query_adv(pool_uuid, opc, upper_ver, stable_eph, generation, NULL, NULL);
}

/*
* Restart rebuild if \a rank's rebuild not finished.
* Only used for massive failure recovery case, see pool_restart_rebuild_if_rank_wip().
Expand Down Expand Up @@ -1423,7 +1439,8 @@ static int
rebuild_leader_start(struct ds_pool *pool, struct rebuild_task *task,
struct rebuild_global_pool_tracker **p_rgt)
{
uint64_t leader_term;
uint64_t leader_term, rebuild_leader_term;
uint32_t leader_rank, rebuild_leader_rank;
uint32_t version;
uint32_t generation;
int rc;
Expand All @@ -1434,12 +1451,17 @@ rebuild_leader_start(struct ds_pool *pool, struct rebuild_task *task,
DP_RC(rc));
return rc;
}
leader_rank = dss_self_rank();

/* If this happened due to leader switch, then do not need update
* generation.
/* If this happened due to leader switch, then do not need update generation.
* If on the same PS leader, it retry the rebuild/reclaim on same version, should bump
* the generation.
*/
ds_rebuild_running_query(pool->sp_uuid, -1, &version, NULL, &generation);
if (version < task->dst_map_ver)
ds_rebuild_running_query_adv(pool->sp_uuid, -1, &version, NULL, &generation,
&rebuild_leader_rank, &rebuild_leader_term);
if ((version < task->dst_map_ver) ||
(version == task->dst_map_ver && leader_rank == rebuild_leader_rank &&
leader_term == rebuild_leader_term))
generation = ++pool->sp_rebuild_gen;

rc = rebuild_prepare(pool, task->dst_map_ver, generation,
Expand Down
Loading