From f3365c4c56c48ba0cc031d63838f206fc89a42da Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 25 Feb 2015 05:44:07 +0000 Subject: [PATCH] ITS#8063 don't block our own thread --- servers/slapd/overlays/syncprov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 9535d333c0..47a5ae9141 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -2120,6 +2120,10 @@ syncprov_op_mod( Operation *op, SlapReply *rs ) mt->mt_tail = mi; /* wait for this op to get to head of list */ while ( mt->mt_mods != mi ) { + /* don't wait on other mods from the same thread */ + if ( mt->mt_mods->mi_op->o_threadctx == op->o_threadctx ) + break; + ldap_pvt_thread_mutex_unlock( &mt->mt_mutex ); /* FIXME: if dynamic config can delete overlays or * databases we'll have to check for cleanup here. -- 2.39.5