Skip to content
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

DAOS-14011 rebuild: incremental reintegration #15671

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+1,593 −534
Open

DAOS-14011 rebuild: incremental reintegration #15671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f7c926
DAOS-16809 vos: container based stable epoch
Nasf-Fan Dec 12, 2024
c6f89d2
DAOS-14010 rebuild: maintain global stable epoch through IV
liuxuezhao Jan 12, 2025
14e3039
DAOS-14010 rebuild: reint from stable epoch
liuxuezhao Jan 12, 2025
a92a767
DAOS-14010 rebuild: discard non-exist cont/obj for reint
liuxuezhao Jan 12, 2025
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
89 changes: 45 additions & 44 deletions src/container/container_iv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* (C) Copyright 2019-2023 Intel Corporation.
* (C) Copyright 2019-2025 Intel Corporation.
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -191,8 +191,9 @@ cont_iv_ent_copy(struct ds_iv_entry *entry, struct cont_iv_key *key,
cip_acl.dal_ace[src->iv_prop.cip_acl.dal_len]);
memcpy(&dst->iv_prop, &src->iv_prop, size);
break;
case IV_CONT_AGG_EPOCH_BOUNDRY:
dst->iv_agg_eph.eph = src->iv_agg_eph.eph;
case IV_CONT_TRACK_EPOCH:
dst->iv_track_eph.ite_ec_agg_eph = src->iv_track_eph.ite_ec_agg_eph;
dst->iv_track_eph.ite_stable_eph = src->iv_track_eph.ite_stable_eph;
break;
default:
rc = -DER_INVAL;
Expand Down Expand Up @@ -551,9 +552,9 @@ cont_iv_ent_fetch(struct ds_iv_entry *entry, struct ds_iv_key *key,
return rc;
}

/* Update the EC agg epoch all servers to the leader */
/* Update the track epoch all servers to the leader */
static int
cont_iv_ent_agg_eph_update(struct ds_iv_entry *entry, struct ds_iv_key *key,
cont_iv_ent_track_eph_update(struct ds_iv_entry *entry, struct ds_iv_key *key,
d_sg_list_t *src)
{
struct cont_iv_key *civ_key = key2priv(key);
Expand All @@ -568,25 +569,25 @@ cont_iv_ent_agg_eph_update(struct ds_iv_entry *entry, struct ds_iv_key *key,
if (rank != entry->ns->iv_master_rank)
return -DER_IVCB_FORWARD;

rc = ds_cont_leader_update_agg_eph(entry->ns->iv_pool_uuid,
civ_key->cont_uuid,
civ_ent->iv_agg_eph.rank,
civ_ent->iv_agg_eph.eph);
rc = ds_cont_leader_update_track_eph(entry->ns->iv_pool_uuid, civ_key->cont_uuid,
civ_ent->iv_track_eph.ite_rank,
civ_ent->iv_track_eph.ite_ec_agg_eph,
civ_ent->iv_track_eph.ite_stable_eph);
return rc;
}

/* Each server refresh the VOS aggregation epoch gotten from the leader */
/* Each server refresh the track epoch gotten from the leader */
static int
cont_iv_ent_agg_eph_refresh(struct ds_iv_entry *entry, struct ds_iv_key *key,
cont_iv_ent_track_eph_refresh(struct ds_iv_entry *entry, struct ds_iv_key *key,
d_sg_list_t *src)
{
struct cont_iv_entry *civ_ent = src->sg_iovs[0].iov_buf;
struct cont_iv_key *civ_key = key2priv(key);
int rc;

rc = ds_cont_tgt_refresh_agg_eph(entry->ns->iv_pool_uuid,
civ_key->cont_uuid,
civ_ent->iv_agg_eph.eph);
rc = ds_cont_tgt_refresh_track_eph(entry->ns->iv_pool_uuid, civ_key->cont_uuid,
civ_ent->iv_track_eph.ite_ec_agg_eph,
civ_ent->iv_track_eph.ite_stable_eph);
return rc;
}

Expand Down Expand Up @@ -638,13 +639,12 @@ cont_iv_ent_update(struct ds_iv_entry *entry, struct ds_iv_key *key,
if (rc)
D_GOTO(out, rc);
} else if (entry->iv_class->iv_class_id ==
IV_CONT_AGG_EPOCH_REPORT) {
rc = cont_iv_ent_agg_eph_update(entry, key, src);
IV_CONT_TRACK_EPOCH_REPORT) {
rc = cont_iv_ent_track_eph_update(entry, key, src);
if (rc)
D_GOTO(out, rc);
} else if (entry->iv_class->iv_class_id ==
IV_CONT_AGG_EPOCH_BOUNDRY) {
rc = cont_iv_ent_agg_eph_refresh(entry, key, src);
} else if (entry->iv_class->iv_class_id == IV_CONT_TRACK_EPOCH) {
rc = cont_iv_ent_track_eph_refresh(entry, key, src);
if (rc)
D_GOTO(out, rc);
}
Expand Down Expand Up @@ -1068,20 +1068,20 @@ cont_iv_hdl_fetch(uuid_t cont_hdl_uuid, uuid_t pool_uuid,
return rc;
}

int
cont_iv_ec_agg_eph_update_internal(void *ns, uuid_t cont_uuid,
daos_epoch_t eph, unsigned int shortcut,
unsigned int sync_mode,
uint32_t op)
static int
cont_iv_track_eph_update_internal(void *ns, uuid_t cont_uuid, daos_epoch_t ec_agg_eph,
daos_epoch_t stable_eph, unsigned int shortcut,
unsigned int sync_mode, uint32_t op)
{
struct cont_iv_entry iv_entry = { 0 };
int rc;

/* Only happens on xstream 0 */
D_ASSERT(dss_get_module_info()->dmi_xs_id == 0);
iv_entry.iv_agg_eph.eph = eph;
iv_entry.iv_track_eph.ite_ec_agg_eph = ec_agg_eph;
iv_entry.iv_track_eph.ite_stable_eph = stable_eph;
uuid_copy(iv_entry.cont_uuid, cont_uuid);
rc = crt_group_rank(NULL, &iv_entry.iv_agg_eph.rank);
rc = crt_group_rank(NULL, &iv_entry.iv_track_eph.ite_rank);
if (rc) {
D_ERROR(DF_UUID" op %d, crt_group_rank failed "DF_RC"\n",
DP_UUID(cont_uuid), op, DP_RC(rc));
Expand All @@ -1097,20 +1097,22 @@ cont_iv_ec_agg_eph_update_internal(void *ns, uuid_t cont_uuid,
}

int
cont_iv_ec_agg_eph_update(void *ns, uuid_t cont_uuid, daos_epoch_t eph)
cont_iv_track_eph_update(void *ns, uuid_t cont_uuid, daos_epoch_t ec_agg_eph,
daos_epoch_t stable_eph)
{
return cont_iv_ec_agg_eph_update_internal(ns, cont_uuid, eph,
CRT_IV_SHORTCUT_TO_ROOT,
CRT_IV_SYNC_NONE,
IV_CONT_AGG_EPOCH_REPORT);
return cont_iv_track_eph_update_internal(ns, cont_uuid, ec_agg_eph, stable_eph,
CRT_IV_SHORTCUT_TO_ROOT,
CRT_IV_SYNC_NONE,
IV_CONT_TRACK_EPOCH_REPORT);
}

int
cont_iv_ec_agg_eph_refresh(void *ns, uuid_t cont_uuid, daos_epoch_t eph)
cont_iv_track_eph_refresh(void *ns, uuid_t cont_uuid, daos_epoch_t ec_agg_eph,
daos_epoch_t stable_eph)
{
return cont_iv_ec_agg_eph_update_internal(ns, cont_uuid, eph,
0, CRT_IV_SYNC_LAZY,
IV_CONT_AGG_EPOCH_BOUNDRY);
return cont_iv_track_eph_update_internal(ns, cont_uuid, ec_agg_eph, stable_eph,
0, CRT_IV_SYNC_LAZY,
IV_CONT_TRACK_EPOCH);
}

int
Expand All @@ -1123,14 +1125,14 @@ ds_cont_fetch_ec_agg_boundary(void *ns, uuid_t cont_uuid)
/* Only happens on xstream 0 */
D_ASSERT(dss_get_module_info()->dmi_xs_id == 0);
uuid_copy(iv_entry.cont_uuid, cont_uuid);
rc = crt_group_rank(NULL, &iv_entry.iv_agg_eph.rank);
rc = crt_group_rank(NULL, &iv_entry.iv_track_eph.ite_rank);
if (rc) {
D_ERROR(DF_UUID" crt_group_rank failed "DF_RC"\n",
DP_UUID(cont_uuid), DP_RC(rc));
return rc;
}

rc = cont_iv_fetch(ns, IV_CONT_AGG_EPOCH_BOUNDRY, cont_uuid, &iv_entry,
rc = cont_iv_fetch(ns, IV_CONT_TRACK_EPOCH, cont_uuid, &iv_entry,
sizeof(struct cont_iv_entry), sizeof(struct cont_iv_entry),
true);
if (rc)
Expand Down Expand Up @@ -1200,11 +1202,11 @@ cont_iv_entry_delete(void *ns, uuid_t pool_uuid, uuid_t cont_uuid)
if (rc != 0)
D_DEBUG(DB_MD, "delete prop "DF_UUID"\n", DP_UUID(cont_uuid));

rc = cont_iv_invalidate(ns, IV_CONT_AGG_EPOCH_REPORT, cont_uuid, CRT_IV_SYNC_NONE);
rc = cont_iv_invalidate(ns, IV_CONT_TRACK_EPOCH_REPORT, cont_uuid, CRT_IV_SYNC_NONE);
if (rc != 0)
D_DEBUG(DB_MD, "delete agg epoch report "DF_UUID"\n", DP_UUID(cont_uuid));

rc = cont_iv_invalidate(ns, IV_CONT_AGG_EPOCH_BOUNDRY, cont_uuid, CRT_IV_SYNC_NONE);
rc = cont_iv_invalidate(ns, IV_CONT_TRACK_EPOCH, cont_uuid, CRT_IV_SYNC_NONE);
if (rc != 0)
D_DEBUG(DB_MD, "delete agg epoch boundary "DF_UUID"\n", DP_UUID(cont_uuid));

Expand Down Expand Up @@ -1665,8 +1667,8 @@ ds_cont_iv_fini(void)
ds_iv_class_unregister(IV_CONT_SNAP);
ds_iv_class_unregister(IV_CONT_CAPA);
ds_iv_class_unregister(IV_CONT_PROP);
ds_iv_class_unregister(IV_CONT_AGG_EPOCH_REPORT);
ds_iv_class_unregister(IV_CONT_AGG_EPOCH_BOUNDRY);
ds_iv_class_unregister(IV_CONT_TRACK_EPOCH_REPORT);
ds_iv_class_unregister(IV_CONT_TRACK_EPOCH);
return 0;
}

Expand All @@ -1687,13 +1689,12 @@ ds_cont_iv_init(void)
if (rc)
D_GOTO(out, rc);

rc = ds_iv_class_register(IV_CONT_AGG_EPOCH_REPORT, &iv_cache_ops,
rc = ds_iv_class_register(IV_CONT_TRACK_EPOCH_REPORT, &iv_cache_ops,
&cont_iv_ops);
if (rc)
D_GOTO(out, rc);

rc = ds_iv_class_register(IV_CONT_AGG_EPOCH_BOUNDRY, &iv_cache_ops,
&cont_iv_ops);
rc = ds_iv_class_register(IV_CONT_TRACK_EPOCH, &iv_cache_ops, &cont_iv_ops);
if (rc)
D_GOTO(out, rc);
out:
Expand Down
Loading
Loading