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#9584 serialize refresh phase

Browse source 
Only allow one consumer at a time to perform a refresh on a database.
This commit is contained in:
Howard Chu 2021-07-27 16:10:29 +01:00
parent 73e7034d66
commit e1c90d0977
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
servers/slapd/syncrepl.c
View file

@ -85,6 +85,9 @@ typedef struct cookie_state {
struct berval *cs_pvals; struct berval *cs_pvals;
int *cs_psids; int *cs_psids;
int cs_pnum; int cs_pnum;
/* serialize multi-consumer refreshes */
ldap_pvt_thread_mutex_t cs_refresh_mutex;
} cookie_state; } cookie_state;
#define SYNCDATA_DEFAULT 0 /* entries are plain LDAP entries */ #define SYNCDATA_DEFAULT 0 /* entries are plain LDAP entries */
@ -915,6 +918,12 @@ check_syncprov(
return changed; return changed;
} }
#define SYNC_TIMEOUT 0
#define SYNC_SHUTDOWN -100
#define SYNC_ERROR -101
#define SYNC_REPOLL -102
#define SYNC_PAUSED -103
static int static int
do_syncrep1( do_syncrep1(
Operation *op, Operation *op,
@ -928,6 +937,13 @@ do_syncrep1(
void *ssl; void *ssl;
#endif #endif
while ( ldap_pvt_thread_mutex_trylock( &si->si_cookieState->cs_refresh_mutex )) {
if ( slapd_shutdown )
return SYNC_SHUTDOWN;
if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool ))
ldap_pvt_thread_yield();
}
si->si_lastconnect = slap_get_time(); si->si_lastconnect = slap_get_time();
si->si_refreshDone = 0; si->si_refreshDone = 0;
rc = slap_client_connect( &si->si_ld, &si->si_bindconf ); rc = slap_client_connect( &si->si_ld, &si->si_bindconf );
@ -1104,6 +1120,7 @@ done:
ldap_unbind_ext( si->si_ld, NULL, NULL ); ldap_unbind_ext( si->si_ld, NULL, NULL );
si->si_ld = NULL; si->si_ld = NULL;
} }
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_refresh_mutex );
} }
return rc; return rc;
@ -1184,12 +1201,6 @@ check_csn_age(
return rc; return rc;
} }
#define SYNC_TIMEOUT 0
#define SYNC_SHUTDOWN -100
#define SYNC_ERROR -101
#define SYNC_REPOLL -102
#define SYNC_PAUSED -103
static int static int
get_pmutex( get_pmutex(
syncinfo_t *si syncinfo_t *si
@ -1233,6 +1244,7 @@ do_syncrep2(
struct timeval tout = { 0, 0 }; struct timeval tout = { 0, 0 };
int refreshDeletes = 0; int refreshDeletes = 0;
int refreshEnded = 0;
char empty[6] = "empty"; char empty[6] = "empty";
if ( slapd_shutdown ) { if ( slapd_shutdown ) {
@ -1524,6 +1536,7 @@ logerr:
Debug( LDAP_DEBUG_SYNC, Debug( LDAP_DEBUG_SYNC,
"do_syncrep2: %s LDAP_RES_SEARCH_RESULT\n", "do_syncrep2: %s LDAP_RES_SEARCH_RESULT\n",
si->si_ridtxt ); si->si_ridtxt );
refreshEnded = 1;
err = LDAP_OTHER; /* FIXME check parse result properly */ err = LDAP_OTHER; /* FIXME check parse result properly */
ldap_parse_result( si->si_ld, msg, &err, NULL, NULL, NULL, ldap_parse_result( si->si_ld, msg, &err, NULL, NULL, NULL,
&rctrls, 0 ); &rctrls, 0 );
@ -1752,8 +1765,9 @@ logerr:
} }
ber_scanf( ber, /*"{"*/ "}" ); ber_scanf( ber, /*"{"*/ "}" );
if ( si->si_refreshDone ) { if ( si->si_refreshDone ) {
Debug( LDAP_DEBUG_SYNC, "do_syncrep1: %s finished refresh\n", Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s finished refresh\n",
si->si_ridtxt ); si->si_ridtxt );
refreshEnded = 1;
} }
break; break;
case LDAP_TAG_SYNC_ID_SET: case LDAP_TAG_SYNC_ID_SET:
@ -1900,6 +1914,8 @@ done:
"do_syncrep2: %s (%d) %s\n", "do_syncrep2: %s (%d) %s\n",
si->si_ridtxt, err, ldap_err2string( err ) ); si->si_ridtxt, err, ldap_err2string( err ) );
} }
if ( refreshEnded || ( rc && !si->si_refreshDone ))
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_refresh_mutex );
slap_sync_cookie_free( &syncCookie, 0 ); slap_sync_cookie_free( &syncCookie, 0 );
slap_sync_cookie_free( &syncCookie_req, 0 ); slap_sync_cookie_free( &syncCookie_req, 0 );
@ -5936,6 +5952,7 @@ syncinfo_free( syncinfo_t *sie, int free_all )
ch_free( sie->si_cookieState->cs_psids ); ch_free( sie->si_cookieState->cs_psids );
ber_bvarray_free( sie->si_cookieState->cs_pvals ); ber_bvarray_free( sie->si_cookieState->cs_pvals );
ldap_pvt_thread_mutex_destroy( &sie->si_cookieState->cs_pmutex ); ldap_pvt_thread_mutex_destroy( &sie->si_cookieState->cs_pmutex );
ldap_pvt_thread_mutex_destroy( &sie->si_cookieState->cs_refresh_mutex );
ch_free( sie->si_cookieState ); ch_free( sie->si_cookieState );
} }
} }
@ -7147,6 +7164,7 @@ add_syncrepl(
si->si_cookieState = ch_calloc( 1, sizeof( cookie_state )); si->si_cookieState = ch_calloc( 1, sizeof( cookie_state ));
ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_mutex ); ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_mutex );
ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_pmutex ); ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_pmutex );
ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_refresh_mutex );
ldap_pvt_thread_cond_init( &si->si_cookieState->cs_cond ); ldap_pvt_thread_cond_init( &si->si_cookieState->cs_cond );
c->be->be_syncinfo = si; c->be->be_syncinfo = si;