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-4350 Placement: Extended Placement Unit Test #2284

Merged
merged 10 commits into from
Apr 24, 2020
Merged

DAOS-4350 Placement: Extended Placement Unit Test #2284

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ca38c6
DAOS-4350 Placement: Extended Placement Unit Test
PetFet Mar 20, 2020
2b106e1
Merge remote-tracking branch 'origin/master' into DAOS-4350
PetFet Mar 31, 2020
3c9d3b9
Addressed Style Warnings.
PetFet Mar 31, 2020
c5517d2
Merge remote-tracking branch 'origin/master' into DAOS-4350
PetFet Apr 2, 2020
707647e
Merge remote-tracking branch 'origin/master' into DAOS-4350
PetFet Apr 6, 2020
32ede35
Re-enabled Erasure Coding Object Class Tests.
PetFet Apr 7, 2020
3c94800
Changed find_targets to find_nodes.
PetFet Apr 8, 2020
bcf5639
Merge remote-tracking branch 'origin/master' into DAOS-4350
PetFet Apr 13, 2020
5aa6ad3
Merge remote-tracking branch 'origin/master' into DAOS-4350
PetFet Apr 20, 2020
f7006ed
Merge remote-tracking branch 'origin/master' into DAOS-4350
PetFet Apr 22, 2020
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
57 changes: 14 additions & 43 deletions src/placement/jump_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,22 +336,19 @@ uint32_t
count_available_spares(struct pl_jump_map *jmap, struct pl_obj_layout *layout,
uint32_t failed_in_layout)
{
uint32_t num_failed;
uint32_t spares_left;
uint32_t unusable_tgts;
uint32_t num_targets;

spares_left = jmap->jmp_domain_nr;
num_failed = pool_map_get_failed_cnt(jmap->jmp_map.pl_poolmap,
jmap->min_redundant_dom);
num_targets = pool_map_find_target(jmap->jmp_map.pl_poolmap,
PO_COMP_ID_ALL, NULL);

if (spares_left + failed_in_layout < (num_failed + layout->ol_nr))
/* we might not have any valid targets left at all */
unusable_tgts = layout->ol_nr;

if (unusable_tgts >= num_targets || layout->ol_grp_size == 1)
return 0;

/* Add back the ones already counted as failed in the layout
* Or we would double count them.
*/
spares_left = spares_left - (num_failed + layout->ol_nr);
spares_left += failed_in_layout;
return spares_left;
return num_targets - unusable_tgts;
}

/**
Expand Down Expand Up @@ -422,9 +419,7 @@ obj_remap_shards(struct pl_jump_map *jmap, struct daos_obj_md *md,

get_target(root, &spare_tgt, crc(key, rebuild_key),
dom_used, tgts_used, layout, shard_id);

if (pool_target_unavail(spare_tgt, for_reint) == false)
spares_left--;
spares_left--;
}

determine_valid_spares(spare_tgt, md, spare_avail, &current,
Expand Down Expand Up @@ -515,12 +510,10 @@ get_object_layout(struct pl_jump_map *jmap, struct pl_obj_layout *layout,
{
struct pool_target *target;
struct pool_domain *root;
struct pool_domain *min_redundant_dom;
daos_obj_id_t oid;
uint8_t *dom_used;
uint8_t *tgts_used;
uint32_t dom_used_length;
uint32_t doms_left;
uint64_t key;
uint32_t fail_tgt_cnt;
int i, j, k, rc;
Expand All @@ -533,17 +526,8 @@ get_object_layout(struct pl_jump_map *jmap, struct pl_obj_layout *layout,
fail_tgt_cnt = 0;
oid = md->omd_id;
key = oid.hi ^ oid.lo;
doms_left = jmap->jmp_domain_nr;
target = NULL;

rc = pool_map_find_domain(jmap->jmp_map.pl_poolmap,
jmap->min_redundant_dom,
PO_COMP_ID_ALL, &min_redundant_dom);
if (rc == 0) {
D_ERROR("Could not find node type in pool map.");
return -DER_NONEXIST;
}

rc = pool_map_find_domain(jmap->jmp_map.pl_poolmap, PO_COMP_TP_ROOT,
PO_COMP_ID_ALL, &root);
if (rc == 0) {
Expand Down Expand Up @@ -597,20 +581,8 @@ get_object_layout(struct pl_jump_map *jmap, struct pl_obj_layout *layout,
k = 1;
}


for (i = 0; i < jmop->jmop_grp_nr; i++) {

if (doms_left < jmop->jmop_grp_size) {
uint32_t start_dom;
uint32_t end_dom;

doms_left = jmap->jmp_domain_nr;
start_dom = min_redundant_dom - root;
end_dom = start_dom + (doms_left - 1);

clrbit_range(dom_used, start_dom, end_dom);
}

for (; j < jmop->jmop_grp_size; j++, k++) {
uint32_t tgt_id;
uint32_t fseq;
Expand All @@ -633,13 +605,12 @@ get_object_layout(struct pl_jump_map *jmap, struct pl_obj_layout *layout,
if (rc)
D_GOTO(out, rc);
}
doms_left--;
}
j = 0;
}

rc = obj_remap_shards(jmap, md, layout, jmop, remap_list, for_reint,
tgts_used, dom_used, fail_tgt_cnt);
rc = obj_remap_shards(jmap, md, layout, jmop, remap_list,
for_reint, tgts_used, dom_used, fail_tgt_cnt);
out:
if (rc) {
D_ERROR("jump_map_obj_layout_fill failed, rc "DF_RC"\n",
Expand Down Expand Up @@ -971,8 +942,8 @@ jump_map_obj_find_reint(struct pl_map *map, struct daos_obj_md *md,
}

rc = remap_list_fill(map, md, shard_md, reint_ver, tgt_rank, shard_id,
array_size, myrank, &idx, layout, &reint_list);

array_size, myrank, &idx, reint_layout,
&reint_list);
out:
remap_list_free_all(&reint_list);
remap_list_free_all(&remap_list);
Expand Down
Loading