Skip to content

DAOS-18728 pool: not bump pool_component::co_in_ver when UP to UPIN #17772

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

Draft
Nasf-Fan wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Draft

DAOS-18728 pool: not bump pool_component::co_in_ver when UP to UPIN #17772

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion src/common/pool_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,6 @@ update_dom_status(struct pool_domain *domain, uint32_t id, uint32_t status, uint
child->do_comp.co_rank, child->do_comp.co_id,
child->do_comp.co_status, status);
child->do_comp.co_status = status;
child->do_comp.co_in_ver = version;
*updated = true;
}
break;
Expand Down
3 changes: 2 additions & 1 deletion src/dtx/dtx_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2420,7 +2420,8 @@ dtx_leader_get(struct ds_pool *pool, struct dtx_memberships *mbs, daos_unit_oid_
D_ASSERT(rc == 1);

/* The target that (re-)joined the system after DTX cannot be the leader. */
if ((*p_tgt)->ta_comp.co_in_ver <= version)
if ((*p_tgt)->ta_comp.co_status == PO_COMP_ST_UPIN &&
(*p_tgt)->ta_comp.co_in_ver <= version)
D_GOTO(out, rc = 0);
}

Expand Down
2 changes: 1 addition & 1 deletion src/pool/srv_pool_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ update_tgt_up_to_upin(uuid_t pool_uuid, struct pool_map *map, struct pool_target
D_DEBUG(DB_MD, DF_MAP ": change " DF_TARGET " to UPIN\n", DP_MAP(pool_uuid, map),
DP_TARGET(target));
target->ta_comp.co_flags = 0;
target->ta_comp.co_in_ver = ++(*version);
++(*version);
target->ta_comp.co_status = PO_COMP_ST_UPIN;
if (print_changes)
D_PRINT(DF_MAP ": " DF_TARGET " is reintegrated.\n", DP_MAP(pool_uuid, map),
Expand Down
Loading