Skip to content

DAOS-18607 object: make EC aggregation yield more frequently #17898

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
gnailzenh merged 1 commit into from
Apr 9, 2026
Merged

DAOS-18607 object: make EC aggregation yield more frequently #17898

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
15 changes: 10 additions & 5 deletions src/object/srv_ec_aggregate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
#include "srv_internal.h"

#define EC_AGG_ITERATION_MAX 1024
#define EC_AGG_PROCESS_CREDITS 128
#define EC_AGG_FILTER_CREDITS 1
#define EC_AGG_SCAN_CREDITS 20

/* Pool/container info. Shared handle UUIDs, and service list are initialized
* in system Xstream.
Expand Down Expand Up @@ -2149,6 +2152,7 @@ agg_data_extent(struct ec_agg_param *agg_param, vos_iter_entry_t *entry,
DP_RC(rc));
D_GOTO(out, rc);
}
agg_param->ap_credits += EC_AGG_PROCESS_CREDITS;
D_ASSERT(agg_entry->ae_cur_stripe.as_extent_cnt == 0);
}
}
Expand All @@ -2171,6 +2175,7 @@ agg_akey_post(daos_handle_t ih, struct ec_agg_param *agg_param,
DP_RC(rc));
return rc;
}
agg_param->ap_credits += EC_AGG_PROCESS_CREDITS;

agg_entry->ae_cur_stripe.as_stripenum = 0UL;
agg_entry->ae_cur_stripe.as_hi_epoch = 0UL;
Expand Down Expand Up @@ -2444,14 +2449,14 @@ agg_filter(daos_handle_t ih, vos_iter_desc_t *desc, void *cb_arg, unsigned int *
DP_OID(desc->id_oid.id_pub),
daos_obj_id2class(desc->id_oid.id_pub));
*acts = VOS_ITER_CB_SKIP;
agg_param->ap_credits++;
agg_param->ap_credits += EC_AGG_FILTER_CREDITS;
goto done;
}

if (!daos_oclass_is_ec(&oca)) { /* Skip non-EC object */
D_DEBUG(DB_EPC, "Skip oid:"DF_UOID" non-ec obj\n",
DP_UOID(desc->id_oid));
agg_param->ap_credits++;
agg_param->ap_credits += EC_AGG_FILTER_CREDITS;
*acts = VOS_ITER_CB_SKIP;
goto done;
}
Expand All @@ -2466,14 +2471,14 @@ agg_filter(daos_handle_t ih, vos_iter_desc_t *desc, void *cb_arg, unsigned int *
D_DEBUG(DB_EPC, "Skip key:"DF_KEY" agg_epoch="DF_X64" filter="DF_X64"\n",
DP_KEY(&desc->id_key), desc->id_agg_write,
agg_param->ap_filter_eph);
agg_param->ap_credits++;
agg_param->ap_credits += EC_AGG_FILTER_CREDITS;
*acts = VOS_ITER_CB_SKIP;
goto done;
}

/* This MUST be the last check */
if (desc->id_type == VOS_ITER_OBJ && vos_bkt_iter_skip(ih, desc)) {
agg_param->ap_credits++;
agg_param->ap_credits += EC_AGG_FILTER_CREDITS;
*acts |= VOS_ITER_CB_SKIP;
goto done;
}
Expand Down Expand Up @@ -2588,7 +2593,7 @@ agg_iterate_pre_cb(daos_handle_t ih, vos_iter_entry_t *entry,
return rc;
}

agg_param->ap_credits += 20;
agg_param->ap_credits += EC_AGG_SCAN_CREDITS;
if (agg_param->ap_credits > agg_param->ap_credits_max) {
agg_param->ap_credits = 0;
D_DEBUG(DB_EPC, "EC aggregation yield type %d. acts %u\n",
Expand Down
Loading