mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't bail out if all targets are too lazy...

Browse Source
This commit is contained in:
Pierangelo Masarati 2007-01-18 01:13:39 +00:00
parent 02af23c4c1
commit 814b8a1438
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
servers/slapd/back-meta/search.c
View File

@ -42,6 +42,7 @@
*/ */
#define META_MSGID_IGNORE (-1) #define META_MSGID_IGNORE (-1)
#define META_MSGID_NEED_BIND (-2) #define META_MSGID_NEED_BIND (-2)
#define META_MSGID_CONNECTING (-3)
static int static int
meta_send_entry( meta_send_entry(
@ -57,7 +58,8 @@ typedef enum meta_search_candidate_t {
META_SEARCH_NOT_CANDIDATE, META_SEARCH_NOT_CANDIDATE,
META_SEARCH_CANDIDATE, META_SEARCH_CANDIDATE,
META_SEARCH_BINDING, META_SEARCH_BINDING,
META_SEARCH_NEED_BIND META_SEARCH_NEED_BIND,
META_SEARCH_CONNECTING
} meta_search_candidate_t; } meta_search_candidate_t;
/* /*
@ -256,11 +258,11 @@ retry:;
case LDAP_X_CONNECTING: case LDAP_X_CONNECTING:
/* must retry, same conn */ /* must retry, same conn */
candidates[ candidate ].sr_msgid = META_MSGID_NEED_BIND; candidates[ candidate ].sr_msgid = META_MSGID_CONNECTING;
ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex ); ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
LDAP_BACK_CONN_BINDING_CLEAR( msc ); LDAP_BACK_CONN_BINDING_CLEAR( msc );
ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex ); ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
return META_SEARCH_NEED_BIND; return META_SEARCH_CONNECTING;
case LDAP_SERVER_DOWN: case LDAP_SERVER_DOWN:
down:; down:;
@ -733,6 +735,7 @@ getconn:;
++needbind; ++needbind;
/* fallthru */ /* fallthru */
case META_SEARCH_CONNECTING:
case META_SEARCH_CANDIDATE: case META_SEARCH_CANDIDATE:
case META_SEARCH_BINDING: case META_SEARCH_BINDING:
candidates[ i ].sr_type = REP_INTERMEDIATE; candidates[ i ].sr_type = REP_INTERMEDIATE;
@ -883,7 +886,9 @@ getconn:;
} }
/* if target still needs bind, retry */ /* if target still needs bind, retry */
if ( candidates[ i ].sr_msgid == META_MSGID_NEED_BIND ) { if ( candidates[ i ].sr_msgid == META_MSGID_NEED_BIND
|| candidates[ i ].sr_msgid == META_MSGID_CONNECTING )
{
/* initiate dobind */ /* initiate dobind */
retcode = meta_search_dobind_init( op, rs, &mc, i, candidates ); retcode = meta_search_dobind_init( op, rs, &mc, i, candidates );
@ -895,6 +900,7 @@ getconn:;
alreadybound--; alreadybound--;
/* fallthru */ /* fallthru */
case META_SEARCH_CONNECTING:
case META_SEARCH_BINDING: case META_SEARCH_BINDING:
break; break;
@ -1032,6 +1038,7 @@ really_bad:;
continue; continue;
case META_SEARCH_BINDING: case META_SEARCH_BINDING:
case META_SEARCH_CONNECTING:
case META_SEARCH_NEED_BIND: case META_SEARCH_NEED_BIND:
case META_SEARCH_UNDEFINED: case META_SEARCH_UNDEFINED:
assert( 0 ); assert( 0 );