upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-28 10:39:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9789 slapd-asyncmeta: Reset op->o_counters every time we migrate to a new thread

Browse source
This commit is contained in:
Ondřej Kuzník 2022-01-25 14:13:07 +00:00 committed by Quanah Gibson-Mount
parent ebc7369727
commit f5d86968c7
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
servers/slapd/back-asyncmeta/add.c
View file

@ -51,6 +51,7 @@ asyncmeta_error_cleanup(Operation *op,
}
asyncmeta_drop_bc(mc, bc);
slap_sl_mem_setctx(op->o_threadctx, op->o_tmpmemctx);
operation_counter_init( op, op->o_threadctx );
ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
send_ldap_result(op, rs);
return LDAP_SUCCESS;

15
servers/slapd/back-asyncmeta/meta_result.c
View file

@ -650,6 +650,7 @@ asyncmeta_send_all_pending_ops(a_metaconn_t *mc, int candidate, void *ctx, int d
bc->op->o_threadctx = ctx;
bc->op->o_tid = ldap_pvt_thread_pool_tid( ctx );
slap_sl_mem_setctx(ctx, bc->op->o_tmpmemctx);
operation_counter_init( bc->op, ctx );
bc->bc_active++;
ret = asyncmeta_send_pending_op(bc, candidate);
if (ret != META_SEARCH_CANDIDATE) {
@ -699,6 +700,7 @@ asyncmeta_return_bind_errors(a_metaconn_t *mc, int candidate, SlapReply *bind_re
bc->op->o_threadctx = ctx;
bc->op->o_tid = ldap_pvt_thread_pool_tid( ctx );
slap_sl_mem_setctx(ctx, bc->op->o_tmpmemctx);
operation_counter_init( bc->op, ctx );
bc->rs.sr_err = bind_result->sr_err;
bc->rs.sr_text = bind_result->sr_text;
mc->pending_ops--;
@ -1422,6 +1424,7 @@ asyncmeta_op_read_error(a_metaconn_t *mc, int candidate, int error, void* ctx)
bc->op->o_threadctx = ctx;
bc->op->o_tid = ldap_pvt_thread_pool_tid( ctx );
slap_sl_mem_setctx(ctx, bc->op->o_tmpmemctx);
operation_counter_init( bc->op, ctx );
op = bc->op;
rs = &bc->rs;
@ -1569,6 +1572,7 @@ retry_bc:
bc->op->o_threadctx = ctx;
bc->op->o_tid = ldap_pvt_thread_pool_tid( ctx );
slap_sl_mem_setctx(ctx, bc->op->o_tmpmemctx);
operation_counter_init( bc->op, ctx );
if (bc->op->o_abandon) {
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex );
asyncmeta_drop_bc( mc, bc);
@ -1668,12 +1672,14 @@ void* asyncmeta_timeout_loop(void *ctx, void *arg)
}
if (bc->op->o_abandon ) {
/* set our memctx */
bc->op->o_threadctx = ctx;
bc->op->o_tid = ldap_pvt_thread_pool_tid( ctx );
slap_sl_mem_setctx(ctx, bc->op->o_tmpmemctx);
Operation *op = bc->op;
/* set our memctx */
op->o_threadctx = ctx;
op->o_tid = ldap_pvt_thread_pool_tid( ctx );
slap_sl_mem_setctx(ctx, op->o_tmpmemctx);
operation_counter_init( op, ctx );
LDAP_STAILQ_REMOVE(&mc->mc_om_list, bc, bm_context_t, bc_next);
mc->pending_ops--;
for (j=0; j<mi->mi_ntargets; j++) {
@ -1730,6 +1736,7 @@ void* asyncmeta_timeout_loop(void *ctx, void *arg)
bc->op->o_threadctx = ctx;
bc->op->o_tid = ldap_pvt_thread_pool_tid( ctx );
slap_sl_mem_setctx(ctx, bc->op->o_tmpmemctx);
operation_counter_init( bc->op, ctx );
if (bc->searchtime) {
timeout_err = LDAP_TIMELIMIT_EXCEEDED;

1
servers/slapd/back-asyncmeta/search.c
View file

@ -58,6 +58,7 @@ asyncmeta_handle_onerr_stop(Operation *op,
}
}
slap_sl_mem_setctx(op->o_threadctx, op->o_tmpmemctx);
operation_counter_init( op, op->o_threadctx );
ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
send_ldap_result(op, rs);
}