From 61fcf534c3da767788e27641f3ebfe4d6a6c0b25 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Oct 09 2023 10:53:28 +0000 Subject: Add more ignores to modrdn and modify cases BZ 2124214 - schema compat plugin deadlock on delete post op Signed-off-by: Alexander Bokovoy --- diff --git a/src/back-shr.c b/src/back-shr.c index 1792bef..4cbc39b 100644 --- a/src/back-shr.c +++ b/src/back-shr.c @@ -2463,6 +2463,15 @@ backend_shr_modify_cb(Slapi_PBlock *pb) /* No data yet, ignore */ return 0; } + + if (backend_shr_write_ignore(pb)) { +#if DEBUG_MAP_LOCK + slapi_log_error(SLAPI_LOG_FATAL, "schema-compat", + "backend_shr_modify_cb: (%p) operation is not impacting schema compat\n", PR_MyThreadId(), 1); +#endif + return 0; + } + slapi_pblock_get(pb, SLAPI_MODIFY_TARGET, &dn); slapi_pblock_get(pb, SLAPI_MODIFY_MODS, &cbdata.mods); slapi_pblock_get(pb, SLAPI_ENTRY_PRE_OP, &cbdata.e_pre); @@ -2669,6 +2678,15 @@ backend_shr_modrdn_cb(Slapi_PBlock *pb) /* No data yet, ignore */ return 0; } + + if (backend_shr_write_ignore(pb)) { +#if DEBUG_MAP_LOCK + slapi_log_error(SLAPI_LOG_FATAL, "schema-compat", + "backend_shr_modrdn_cb: (%p) operation is not impacting schema compat\n", PR_MyThreadId(), 1); +#endif + return 0; + } + slapi_pblock_get(pb, SLAPI_ENTRY_PRE_OP, &cbdata.e_pre); slapi_pblock_get(pb, SLAPI_ENTRY_POST_OP, &cbdata.e_post);