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-14903 object: fix bug in agg peer status check #13585

Merged
merged 3 commits into from
Jan 23, 2024
Merged

DAOS-14903 object: fix bug in agg peer status check #13585

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc1886d
DAOS-14903 object: fix bug in peer status check
liuxuezhao Jan 10, 2024
2c8b637
Merge branch 'master' into lxz/peer_check_fix
liuxuezhao Jan 11, 2024
babd7c4
Merge branch 'master' into lxz/peer_check_fix
mchaarawi Jan 22, 2024
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
33 changes: 16 additions & 17 deletions src/object/srv_ec_aggregate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,9 +1305,9 @@ agg_peer_update_ult(void *arg)
iod.iod_size = entry->ae_rsize;
obj = obj_hdl2ptr(entry->ae_obj_hdl);
for (peer = 0; peer < p; peer++) {
/* Only update the available parities */
if (peer == pidx || entry->ae_peer_pshards[peer].sd_rank == DAOS_TGT_IGNORE)
if (peer == pidx)
continue;
D_ASSERT(entry->ae_peer_pshards[peer].sd_rank != DAOS_TGT_IGNORE);
tgt_ep.ep_rank = entry->ae_peer_pshards[peer].sd_rank;
tgt_ep.ep_tag = entry->ae_peer_pshards[peer].sd_tgt_idx;
enqueue_id = 0;
Expand Down Expand Up @@ -1443,6 +1443,7 @@ agg_peer_update(struct ec_agg_entry *entry, bool write_parity)
struct daos_shard_loc *peer_loc;
uint32_t failed_tgts_cnt = 0;
uint32_t p = ec_age2p(entry);
uint32_t pidx = ec_age2pidx(entry);
uint32_t peer;
int i, tid, rc = 0;

Expand All @@ -1464,24 +1465,19 @@ agg_peer_update(struct ec_agg_entry *entry, bool write_parity)
return rc;
}

rc = agg_get_obj_handle(entry);
if (rc) {
D_ERROR("Failed to open object: "DF_RC"\n", DP_RC(rc));
goto out;
}

if (targets != NULL) {
for (peer = 0; peer < p; peer++) {
if (peer == pidx)
continue;
peer_loc = &entry->ae_peer_pshards[peer];
for (i = 0; i < failed_tgts_cnt; i++) {
if (targets[i].ta_comp.co_rank == peer_loc->sd_rank ||
peer_loc->sd_rank == DAOS_TGT_IGNORE) {
D_DEBUG(DB_EPC, DF_UOID" peer parity "
"tgt gailed rank %d, tgt_idx "
"%d.\n", DP_UOID(entry->ae_oid),
peer_loc->sd_rank,
peer_loc->sd_tgt_idx);
goto out;
if (peer_loc->sd_rank == DAOS_TGT_IGNORE ||
(targets[i].ta_comp.co_rank == peer_loc->sd_rank &&
targets[i].ta_comp.co_index == peer_loc->sd_tgt_idx)) {
D_DEBUG(DB_EPC, DF_UOID" peer parity tgt failed rank %d, "
"tgt_idx %d.\n", DP_UOID(entry->ae_oid),
peer_loc->sd_rank, peer_loc->sd_tgt_idx);
D_GOTO(out, rc = -1);
}
}
}
Expand Down Expand Up @@ -1640,7 +1636,10 @@ agg_process_holes_ult(void *arg)
continue;

for (i = 0; targets && i < failed_tgts_cnt; i++) {
if (targets[i].ta_comp.co_rank == entry->ae_peer_pshards[peer].sd_rank) {
if (entry->ae_peer_pshards[peer].sd_rank == DAOS_TGT_IGNORE ||
(targets[i].ta_comp.co_rank == entry->ae_peer_pshards[peer].sd_rank &&
targets[i].ta_comp.co_index ==
entry->ae_peer_pshards[peer].sd_tgt_idx)) {
D_ERROR(DF_UOID" peer %d parity tgt failed\n",
DP_UOID(entry->ae_oid), peer);
rc = -1;
Expand Down