Skip to content

DAOS-9216 dtx: use helper ULT to send DTX RPC #7779

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

Merged
johannlombardi merged 1 commit into from
Dec 29, 2021
Merged

DAOS-9216 dtx: use helper ULT to send DTX RPC #7779

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
8 changes: 4 additions & 4 deletions src/dtx/dtx_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ dtx_batched_commit_one(void *arg)
break;
}

rc = dtx_commit(cont, dtes, dcks, cnt, true);
rc = dtx_commit(cont, dtes, dcks, cnt);
dtx_free_committable(dtes, dcks, cnt);
if (rc != 0) {
D_WARN("Fail to batched commit %d entries for "DF_UUID": "DF_RC"\n",
Expand Down Expand Up @@ -1299,7 +1299,7 @@ dtx_leader_end(struct dtx_leader_handle *dlh, struct ds_cont_child *cont,
sync:
if (dth->dth_sync) {
dte = &dth->dth_dte;
rc = dtx_commit(cont, &dte, NULL, 1, false);
rc = dtx_commit(cont, &dte, NULL, 1);
if (rc != 0) {
D_ERROR(DF_UUID": Fail to sync commit DTX "DF_DTI
": "DF_RC"\n", DP_UUID(cont->sc_uuid),
Expand Down Expand Up @@ -1500,7 +1500,7 @@ dtx_flush_on_deregister(struct dss_module_info *dmi,
(unsigned long)total,
(unsigned long)stat.dtx_committable_count);

rc = dtx_commit(cont, dtes, dcks, cnt, true);
rc = dtx_commit(cont, dtes, dcks, cnt);
dtx_free_committable(dtes, dcks, cnt);
}

Expand Down Expand Up @@ -1870,7 +1870,7 @@ dtx_obj_sync(struct ds_cont_child *cont, daos_unit_oid_t *oid,
break;
}

rc = dtx_commit(cont, dtes, dcks, cnt, true);
rc = dtx_commit(cont, dtes, dcks, cnt);
dtx_free_committable(dtes, dcks, cnt);
if (rc < 0) {
D_ERROR("Fail to commit dtx: "DF_RC"\n", DP_RC(rc));
Expand Down
3 changes: 2 additions & 1 deletion src/dtx/dtx_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ extern uint32_t dtx_agg_thd_cnt_lo;
#define DTX_AGG_THD_AGE_MIN 210
#define DTX_AGG_THD_AGE_DEF 630

/* The threshold for yield CPU when handle DTX RPC. */
#define DTX_RPC_YIELD_THD 64

/* The time threshold for triggerring DTX aggregation. If the oldest
Expand Down Expand Up @@ -152,7 +153,7 @@ uint64_t dtx_cos_oldest(struct ds_cont_child *cont);

/* dtx_rpc.c */
int dtx_commit(struct ds_cont_child *cont, struct dtx_entry **dtes,
struct dtx_cos_key *dcks, int count, bool helper);
struct dtx_cos_key *dcks, int count);
int dtx_check(struct ds_cont_child *cont, struct dtx_entry *dte,
daos_epoch_t epoch);

Expand Down
2 changes: 1 addition & 1 deletion src/dtx/dtx_resync.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ dtx_resync_commit(struct ds_cont_child *cont,
}

if (j > 0) {
rc = dtx_commit(cont, dtes, dcks, j, true);
rc = dtx_commit(cont, dtes, dcks, j);
if (rc < 0)
D_ERROR("Failed to commit the DTXs: rc = "DF_RC"\n",
DP_RC(rc));
Expand Down
Loading