mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7968 add locks for syncrepl cookiestate

Browse Source 
Mutex must be held even for a read-access of a cookie state,
as there may be a race with write in other thread.
This commit is contained in:
Leo Yuriev 2014-12-05 19:41:40 +00:00 committed by Howard Chu
parent 7a7d941943
commit 8ba5a27829
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
servers/slapd/syncrepl.c
View File

@ -926,6 +926,7 @@ do_syncrep2(
if ( syncCookie.ctxcsn ) { if ( syncCookie.ctxcsn ) {
int i, sid = slap_parse_csn_sid( syncCookie.ctxcsn ); int i, sid = slap_parse_csn_sid( syncCookie.ctxcsn );
check_syncprov( op, si ); check_syncprov( op, si );
ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_mutex );
for ( i =0; i<si->si_cookieState->cs_num; i++ ) { for ( i =0; i<si->si_cookieState->cs_num; i++ ) {
/* new SID */ /* new SID */
if ( sid < si->si_cookieState->cs_sids[i] ) if ( sid < si->si_cookieState->cs_sids[i] )
@ -935,15 +936,18 @@ do_syncrep2(
bdn.bv_val[bdn.bv_len] = '\0'; bdn.bv_val[bdn.bv_len] = '\0';
Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s CSN too old, ignoring %s (%s)\n", Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s CSN too old, ignoring %s (%s)\n",
si->si_ridtxt, syncCookie.ctxcsn->bv_val, bdn.bv_val ); si->si_ridtxt, syncCookie.ctxcsn->bv_val, bdn.bv_val );
si->si_too_old = 1;
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
ldap_controls_free( rctrls ); ldap_controls_free( rctrls );
rc = 0; rc = 0;
si->si_too_old = 1;
goto done; goto done;
} }
si->si_too_old = 0; si->si_too_old = 0;
break; break;
} }
} }
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
/* check pending CSNs too */ /* check pending CSNs too */
while ( ldap_pvt_thread_mutex_trylock( &si->si_cookieState->cs_pmutex )) { while ( ldap_pvt_thread_mutex_trylock( &si->si_cookieState->cs_pmutex )) {
if ( slapd_shutdown ) { if ( slapd_shutdown ) {
@ -953,17 +957,18 @@ do_syncrep2(
if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool )) if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool ))
ldap_pvt_thread_yield(); ldap_pvt_thread_yield();
} }
for ( i =0; i<si->si_cookieState->cs_pnum; i++ ) { for ( i =0; i<si->si_cookieState->cs_pnum; i++ ) {
if ( sid < si->si_cookieState->cs_psids[i] ) if ( sid < si->si_cookieState->cs_psids[i] )
break; break;
if ( si->si_cookieState->cs_psids[i] == sid ) { if ( si->si_cookieState->cs_psids[i] == sid ) {
if ( ber_bvcmp( syncCookie.ctxcsn, &si->si_cookieState->cs_pvals[i] ) <= 0 ) { if ( ber_bvcmp( syncCookie.ctxcsn, &si->si_cookieState->cs_pvals[i] ) <= 0 ) {
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_pmutex );
bdn.bv_val[bdn.bv_len] = '\0'; bdn.bv_val[bdn.bv_len] = '\0';
Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s CSN pending, ignoring %s (%s)\n", Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s CSN pending, ignoring %s (%s)\n",
si->si_ridtxt, syncCookie.ctxcsn->bv_val, bdn.bv_val ); si->si_ridtxt, syncCookie.ctxcsn->bv_val, bdn.bv_val );
ldap_controls_free( rctrls ); ldap_controls_free( rctrls );
rc = 0; rc = 0;
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_pmutex );
goto done; goto done;
} }
ber_bvreplace( &si->si_cookieState->cs_pvals[i], ber_bvreplace( &si->si_cookieState->cs_pvals[i],
@ -1032,6 +1037,7 @@ do_syncrep2(
/* on failure, revert pending CSN */ /* on failure, revert pending CSN */
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
int i; int i;
ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_mutex );
for ( i = 0; i<si->si_cookieState->cs_num; i++ ) { for ( i = 0; i<si->si_cookieState->cs_num; i++ ) {
if ( si->si_cookieState->cs_sids[i] == si->si_cookieState->cs_psids[punlock] ) { if ( si->si_cookieState->cs_sids[i] == si->si_cookieState->cs_psids[punlock] ) {
ber_bvreplace( &si->si_cookieState->cs_pvals[punlock], ber_bvreplace( &si->si_cookieState->cs_pvals[punlock],
@ -1041,6 +1047,7 @@ do_syncrep2(
} }
if ( i == si->si_cookieState->cs_num ) if ( i == si->si_cookieState->cs_num )
si->si_cookieState->cs_pvals[punlock].bv_val[0] = '\0'; si->si_cookieState->cs_pvals[punlock].bv_val[0] = '\0';
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
} }
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_pmutex ); ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_pmutex );
} }