mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#8102 serialize plain syncrepl

Browse Source 
Using cs_pmutex. Reverts the addition of cs_modmutex in ITS#9330,
use cs_pmutex for both delta and plain writes.

Note that plain syncrepl already used cs_pmutex when a cookie CSN
was present in the op. Now it is used for all writes, regardless
of presence of cookie.
This commit is contained in:
Howard Chu 2020-09-09 11:46:02 +01:00 committed by Quanah Gibson-Mount
parent 8bd2d1fee8
commit e02b1d94ca
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
servers/slapd/syncrepl.c
View File

@ -68,7 +68,6 @@ typedef struct cookie_vals {
} cookie_vals;
typedef struct cookie_state {
ldap_pvt_thread_mutex_t cs_modmutex;
ldap_pvt_thread_mutex_t cs_mutex;
ldap_pvt_thread_cond_t cs_cond;
struct berval *cs_vals;
@ -165,7 +164,7 @@ static char *presentlist_find( Avlnode *av, struct berval *syncUUID );
static int presentlist_free( Avlnode *av );
static void syncrepl_del_nonpresent( Operation *, syncinfo_t *, BerVarray, struct sync_cookie *, int );
static int syncrepl_message_to_op(
syncinfo_t *, Operation *, LDAPMessage * );
syncinfo_t *, Operation *, LDAPMessage *, int );
static int syncrepl_message_to_entry(
syncinfo_t *, Operation *, LDAPMessage *,
Modifications **, Entry **, int, struct berval* );
@ -1174,6 +1173,20 @@ check_csn_age(
#define SYNC_REPOLL -102
#define SYNC_PAUSED -103
static int
get_pmutex(
syncinfo_t *si
)
{
while ( ldap_pvt_thread_mutex_trylock( &si->si_cookieState->cs_pmutex )) {
if ( slapd_shutdown )
return SYNC_SHUTDOWN;
if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool ))
ldap_pvt_thread_yield();
}
return 0;
}
static int
do_syncrep2(
Operation *op,
@ -1252,7 +1265,7 @@ do_syncrep2(
}
if ( si->si_syncdata == SYNCDATA_CHANGELOG ) {
if ( si->si_logstate == SYNCLOG_LOGGING ) {
rc = syncrepl_message_to_op( si, op, msg );
rc = syncrepl_message_to_op( si, op, msg, 1 );
if ( rc )
goto logerr;
if ( si->si_type == LDAP_SYNC_REFRESH_AND_PERSIST && rctrls ) {
@ -1363,14 +1376,8 @@ do_syncrep2(
si->si_too_old = 0;
/* check pending CSNs too */
while ( ldap_pvt_thread_mutex_trylock( &si->si_cookieState->cs_pmutex )) {
if ( slapd_shutdown ) {
rc = SYNC_SHUTDOWN;
goto done;
}
if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool ))
ldap_pvt_thread_yield();
}
if (( rc = get_pmutex( si )))
goto done;
i = check_csn_age( si, &bdn, syncCookie.ctxcsn, sid, (cookie_vals *)&si->si_cookieState->cs_pvals, &slot );
if ( i == CV_CSN_OK ) {
@ -1404,7 +1411,7 @@ do_syncrep2(
rc = 0;
if ( si->si_syncdata && si->si_logstate == SYNCLOG_LOGGING ) {
modlist = NULL;
if ( ( rc = syncrepl_message_to_op( si, op, msg ) ) == LDAP_SUCCESS &&
if ( ( rc = syncrepl_message_to_op( si, op, msg, punlock < 0 ) ) == LDAP_SUCCESS &&
syncCookie.ctxcsn )
{
rc = syncrepl_updateCookie( si, op, &syncCookie, 0 );
@ -1433,12 +1440,18 @@ logerr:
} else if ( ( rc = syncrepl_message_to_entry( si, op, msg,
&modlist, &entry, syncstate, syncUUID ) ) == LDAP_SUCCESS )
{
if ( punlock < 0 ) {
if (( rc = get_pmutex( si )))
goto done;
}
if ( ( rc = syncrepl_entry( si, op, entry, &modlist,
syncstate, syncUUID, syncCookie.ctxcsn ) ) == LDAP_SUCCESS &&
syncCookie.ctxcsn )
{
rc = syncrepl_updateCookie( si, op, &syncCookie, 0 );
}
if ( punlock < 0 )
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_pmutex );
}
if ( punlock >= 0 ) {
/* on failure, revert pending CSN */
@ -2752,7 +2765,8 @@ static int
syncrepl_message_to_op(
syncinfo_t *si,
Operation *op,
LDAPMessage *msg
LDAPMessage *msg,
int do_lock
)
{
BerElement *ber = NULL;
@ -2905,8 +2919,11 @@ syncrepl_message_to_op(
goto done;
}
ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_modmutex );
do_unlock = 1;
if ( do_lock ) {
if (( rc = get_pmutex( si )))
goto done;
do_unlock = 1;
}
if ( csn.bv_len ) {
int i, sid = slap_parse_csn_sid( &csn );
ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_mutex );
@ -3046,7 +3063,7 @@ done:
if ( do_graduate )
slap_graduate_commit_csn( op );
if ( do_unlock )
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_modmutex );
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_pmutex );
op->o_bd = si->si_be;
op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
BER_BVZERO( &op->o_csn );
@ -5775,7 +5792,6 @@ syncinfo_free( syncinfo_t *sie, int free_all )
ber_bvarray_free( sie->si_cookieState->cs_vals );
ldap_pvt_thread_cond_destroy( &sie->si_cookieState->cs_cond );
ldap_pvt_thread_mutex_destroy( &sie->si_cookieState->cs_mutex );
ldap_pvt_thread_mutex_destroy( &sie->si_cookieState->cs_modmutex );
ch_free( sie->si_cookieState->cs_psids );
ber_bvarray_free( sie->si_cookieState->cs_pvals );
ldap_pvt_thread_mutex_destroy( &sie->si_cookieState->cs_pmutex );
@ -6594,7 +6610,6 @@ add_syncrepl(
sip->si_next = si;
} else {
si->si_cookieState = ch_calloc( 1, sizeof( cookie_state ));
ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_modmutex );
ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_mutex );
ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_pmutex );
ldap_pvt_thread_cond_init( &si->si_cookieState->cs_cond );