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

ITS#9534 additional

Browse Source 
Partially revert 0b20b92ec1
Reuse the client conn for delta-sync startup
This commit is contained in:
Howard Chu 2021-04-24 15:45:58 +01:00
parent 8a72584bd1
commit 87099f8e0d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/syncrepl.c
View File

@ -1900,6 +1900,8 @@ done:
if ( msg ) ldap_msgfree( msg );
if ( rc ) {
if ( rc == LDAP_SYNC_REFRESH_REQUIRED && si->si_logstate == SYNCLOG_LOGGING && si->si_ld )
return rc
/* never reuse existing connection */
if ( si->si_conn ) {
connection_client_stop( si->si_conn );
@ -2027,7 +2029,6 @@ do_syncrepl(
if ( !si->si_schemachecking )
op->o_no_schema_check = 1;
reload:
/* Establish session, do search */
if ( !si->si_ld ) {
si->si_refreshDelete = 0;
@ -2045,6 +2046,7 @@ reload:
rc = do_syncrep1( op, si );
}
reload:
/* Process results */
if ( rc == LDAP_SUCCESS ) {
ldap_get_option( si->si_ld, LDAP_OPT_DESC, &s );
@ -2066,8 +2068,14 @@ reload:
op->o_ndn = op->o_bd->be_rootndn;
rc = do_syncrep2( op, si );
if ( rc == LDAP_SYNC_REFRESH_REQUIRED ) {
if ( si->si_logstate == SYNCLOG_LOGGING )
if ( si->si_logstate == SYNCLOG_LOGGING ) {
if ( BER_BVISNULL( &si->si_syncCookie.octet_str ))
slap_compose_sync_cookie( NULL, &si->si_syncCookie.octet_str,
si->si_syncCookie.ctxcsn, si->si_syncCookie.rid,
si->si_syncCookie.sid, NULL );
rc = ldap_sync_search( si, op->o_tmpmemctx );
goto reload;
}
/* give up but schedule an immedite retry */
rc = SYNC_PAUSED;
}