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

Jump to bottom

DAOS-16572 rebuild: properly assign global_dtx_resync_version in IV -… #15186

Draft
wants to merge 1 commit into
base: release/2.6
Choose a base branch
from
Draft

DAOS-16572 rebuild: properly assign global_dtx_resync_version in IV -… #15186

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
9 changes: 6 additions & 3 deletions src/rebuild/rebuild_iv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ rebuild_iv_ent_refresh(struct ds_iv_entry *entry, struct ds_iv_key *key,
struct rebuild_tgt_pool_tracker *rpt;
struct rebuild_iv *dst_iv = entry->iv_value.sg_iovs[0].iov_buf;
struct rebuild_iv *src_iv = src->sg_iovs[0].iov_buf;
uint32_t old_ver;
int rc = 0;

rpt = rpt_lookup(src_iv->riv_pool_uuid, -1, src_iv->riv_ver,
Expand Down Expand Up @@ -200,16 +201,18 @@ rebuild_iv_ent_refresh(struct ds_iv_entry *entry, struct ds_iv_key *key,
dst_iv->riv_stable_epoch);
rpt->rt_global_done = dst_iv->riv_global_done;
rpt->rt_global_scan_done = dst_iv->riv_global_scan_done;
if (rpt->rt_global_dtx_resync_version < rpt->rt_rebuild_ver &&
old_ver = rpt->rt_global_dtx_resync_version;
if (rpt->rt_global_dtx_resync_version < dst_iv->riv_global_dtx_resyc_version)
rpt->rt_global_dtx_resync_version = dst_iv->riv_global_dtx_resyc_version;
if (old_ver < rpt->rt_rebuild_ver &&
dst_iv->riv_global_dtx_resyc_version >= rpt->rt_rebuild_ver) {
D_INFO(DF_UUID " global/iv/rebuild_ver %u/%u/%u signal wait cond\n",
DP_UUID(src_iv->riv_pool_uuid), rpt->rt_global_dtx_resync_version,
DP_UUID(src_iv->riv_pool_uuid), old_ver,
dst_iv->riv_global_dtx_resyc_version, rpt->rt_rebuild_ver);
ABT_mutex_lock(rpt->rt_lock);
ABT_cond_signal(rpt->rt_global_dtx_wait_cond);
ABT_mutex_unlock(rpt->rt_lock);
}
rpt->rt_global_dtx_resync_version = dst_iv->riv_global_dtx_resyc_version;
}

out:
Expand Down
Loading