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

ITS#10234 Reinit retry state on refreshDone

Browse source
This commit is contained in:
Ondřej Kuzník 2024-07-19 09:59:56 +01:00 committed by Quanah Gibson-Mount
parent 4448049955
commit 2af486cf00
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servers/slapd/syncrepl.c
View file

@ -532,6 +532,15 @@ refresh_finished(syncinfo_t *si, int reschedule)
syncinfo_t *sie; syncinfo_t *sie;
int removed = 0; int removed = 0;
if ( si->si_ctype > 0 && si->si_refreshDone && si->si_retrynum ) {
/* ITS#10234: We've made meaningful progress, reinit retry state */
int i;
for ( i = 0; si->si_retrynum_init[i] != RETRYNUM_TAIL; i++ ) {
si->si_retrynum[i] = si->si_retrynum_init[i];
}
si->si_retrynum[i] = RETRYNUM_TAIL;
}
ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_refresh_mutex ); ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_refresh_mutex );
if ( si->si_cookieState->cs_refreshing == si ) { if ( si->si_cookieState->cs_refreshing == si ) {
si->si_cookieState->cs_refreshing = NULL; si->si_cookieState->cs_refreshing = NULL;
@ -6211,6 +6220,7 @@ syncinfo_free( syncinfo_t *sie, int free_all )
do { do {
si_next = sie->si_next; si_next = sie->si_next;
sie->si_ctype = 0;
if ( !BER_BVISEMPTY( &sie->si_monitor_ndn )) { if ( !BER_BVISEMPTY( &sie->si_monitor_ndn )) {
syncrepl_monitor_del( sie ); syncrepl_monitor_del( sie );