ITS#5999

diff --git a/CHANGES b/CHANGES
index 31d720de38ba15c8562aaba899af847e85716133..cbf39b1df548d502b053ad74261d50214fadf294 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ OpenLDAP 2.4.16 Engineering
        Fixed slapo-syncprov newCookie sync messages (ITS#5972)
        Fixed slapd-syncprov too many MMR messages (ITS#6020)
        Fixed slapo-syncprov replica lockout (ITS#5985)
+       Fixed slapo-syncprov modtarget tracking (ITS#5999)
        Build Environment
                Cleaned up alloc/free functions for Windows (ITS#6005)
        Documentation

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 969e3024170d2457d794d11b1e58a3a1fa8c4689..6799e03c79dfedb72173c1286feba1fe5a3fe1e7 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -142,6 +142,7 @@ typedef struct syncprov_info_t {
 typedef struct opcookie {
        slap_overinst *son;
        syncmatches *smatches;
+       modtarget *smt;
        struct berval sdn;      /* DN of entry, for deletes */
        struct berval sndn;
        struct berval suuid;    /* UUID of entry */
@@ -1313,26 +1314,24 @@ syncprov_op_cleanup( Operation *op, SlapReply *rs )
        }
 
        /* Remove op from lock table */
-       mtdummy.mt_op = op;
-       ldap_pvt_thread_mutex_lock( &si->si_mods_mutex );
-       mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp );
+       mt = opc->smt;
        if ( mt ) {
                modinst *mi = mt->mt_mods;
 
                /* If there are more, promote the next one */
-               ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
                if ( mi->mi_next ) {
+                       ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
                        mt->mt_mods = mi->mi_next;
                        mt->mt_op = mt->mt_mods->mi_op;
                        ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
                } else {
+                       ldap_pvt_thread_mutex_lock( &si->si_mods_mutex );
                        avl_delete( &si->si_mods, mt, sp_avl_cmp );
-                       ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
+                       ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
                        ldap_pvt_thread_mutex_destroy( &mt->mt_mutex );
                        ch_free( mt );
                }
        }
-       ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
        if ( !BER_BVISNULL( &opc->suuid ))
                op->o_tmpfree( opc->suuid.bv_val, op->o_tmpmemctx );
        if ( !BER_BVISNULL( &opc->sndn ))
@@ -1974,6 +1973,7 @@ syncprov_op_mod( Operation *op, SlapReply *rs )
                        avl_insert( &si->si_mods, mt, sp_avl_cmp, avl_dup_error );
                        ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
                }
+               opc->smt = mt;
        }
 
        if (( have_psearches || si->si_logs ) && op->o_tag != LDAP_REQ_ADD )

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index a42a52cddea29a1efa431f701568b2b3a095c2c1..4ffdb74434f9d92806ff1c5cd4a22b983741d2ff 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -46,8 +46,8 @@ WITH_SASL=${AC_WITH_SASL-no}
 USE_SASL=${SLAPD_USE_SASL-no}
 ACI=${AC_ACI_ENABLED-acino}
 THREADS=${AC_THREADS-threadsno}
-SLEEP1=${SLEEP1-7}
-SLEEP2=${SLEEP2-15}
+SLEEP1=${SLEEP1-20}
+SLEEP2=${SLEEP2-30}
 
 # dirs
 PROGDIR=./progs