upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8102 syncrepl: only use trylock on the cn=config DB

Browse source
This commit is contained in:
Howard Chu 2020-09-22 12:18:52 +01:00
parent ebb4b82fcf
commit 62ecd38bc4
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
servers/slapd/syncrepl.c
View file

@ -145,6 +145,7 @@ typedef struct syncinfo_s {
int si_got; int si_got;
int si_strict_refresh; /* stop listening during fallback refresh */ int si_strict_refresh; /* stop listening during fallback refresh */
int si_too_old; int si_too_old;
int si_is_configdb;
ber_int_t si_msgid; ber_int_t si_msgid;
Avlnode *si_presentlist; Avlnode *si_presentlist;
LDAP *si_ld; LDAP *si_ld;
@ -1194,12 +1195,18 @@ get_pmutex(
syncinfo_t *si syncinfo_t *si
) )
{ {
while ( ldap_pvt_thread_mutex_trylock( &si->si_cookieState->cs_pmutex )) { if ( !si->si_is_configdb ) {
if ( slapd_shutdown ) ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_pmutex );
return SYNC_SHUTDOWN; } else {
if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool )) /* avoid deadlock when replicating cn=config */
ldap_pvt_thread_yield(); 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; return 0;
} }
@ -6969,6 +6976,8 @@ add_syncrepl(
ldap_pvt_thread_mutex_init( &si->si_monitor_mutex ); ldap_pvt_thread_mutex_init( &si->si_monitor_mutex );
ldap_pvt_thread_mutex_init( &si->si_mutex ); ldap_pvt_thread_mutex_init( &si->si_mutex );
si->si_is_configdb = strcmp( c->be->be_suffix[0].bv_val, "cn=config" ) == 0;
rc = parse_syncrepl_line( c, si ); rc = parse_syncrepl_line( c, si );
if ( rc == 0 ) { if ( rc == 0 ) {