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

allow per-target retry in searches (ITS#4150)

Browse source
This commit is contained in:
Pierangelo Masarati 2005-11-05 14:45:38 +00:00
parent 852e4e3109
commit f0dac82597
3 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/data/meta.out
View file

@ -1411,3 +1411,13 @@ member: cn=Another Added Group,ou=Groups,o=Example,c=US
# refldap://localhost:9016/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
# searching filter="(member=cn=Another Added Group,ou=Groups,o=Example,c=US)"
# attrs="member"
# base="o=Example,c=US"
# with a timed out connection...
dn: cn=Another Added Group,ou=Groups,o=Example,c=US
member: cn=Added Group,ou=Groups,o=Example,c=US
member: cn=Another Added Group,ou=Groups,o=Example,c=US
# refldap://localhost:9016/cn=Somewhere,ou=Meta,dc=example,dc=com??sub

2
tests/data/slapd-meta2.conf
View file

@ -35,6 +35,8 @@ argsfile @TESTDIR@/slapd.2.args
#rwmmod#modulepath ../servers/slapd/overlays/
#rwmmod#moduleload rwm.la
idletimeout 5
#######################################################################
# database definitions
#######################################################################

34
tests/scripts/test035-meta
View file

@ -412,6 +412,38 @@ case $RC in
;;
esac
echo "Waiting 10 seconds for cached connections to timeout..."
sleep 10
echo "Searching with a timed out connection..."
echo "# searching filter=\"$FILTER\"" >> $SEARCHOUT
echo "# attrs=\"member\"" >> $SEARCHOUT
echo "# base=\"$BASEDN\"" >> $SEARCHOUT
echo "# with a timed out connection..." >> $SEARCHOUT
$LDAPSEARCH -S "" -h $LOCALHOST -p $PORT3 -D "cn=Manager,$BASEDN" -w $PASSWD \
-b "$BASEDN" "$FILTER" member \
>> $SEARCHOUT 2>&1
RC=$?
#if test $RC != 0 ; then
# echo "Search failed ($RC)!"
# test $KILLSERVERS != no && kill -HUP $KILLPIDS
# exit $RC
#fi
case $RC in
0)
;;
51)
echo "### Hit LDAP_BUSY problem; you may want to re-run the test"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 0
;;
*)
echo "Search failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
;;
esac
echo "Filtering ldapsearch results..."
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Filtering original ldif used to create database..."
@ -576,7 +608,7 @@ RC=$?
#if test $RC != 6 ; then
# echo "Compare failed ($RC)!"
# test $KILLSERVERS != no && kill -HUP $KILLPIDS
# exit $RC
# exit -1
#fi
case $RC in
6)