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

fix timings and retry between syncrepl and server startup

Browse source
This commit is contained in:
Pierangelo Masarati 2005-12-15 10:14:39 +00:00
parent 69caf0b333
commit d5b9945700
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/data/slapd-glue-syncrepl1.conf
View file

@ -81,7 +81,7 @@ syncrepl rid=1
schemachecking=off
scope=sub
type=refreshAndPersist
retry="10 3 300 5"
retry="3 3 300 5"
updateref @URI2@
#overlay syncprov

2
tests/data/slapd-glue-syncrepl2.conf
View file

@ -61,7 +61,7 @@ syncrepl rid=2
schemachecking=off
scope=sub
type=refreshAndPersist
retry="10 3 300 5"
retry="3 3 300 5"
updateref @URI1@
#overlay syncprov

29
tests/scripts/test033-glue-syncrepl
View file

@ -42,18 +42,6 @@ KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that slapd 1 is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' > /dev/null 2>&1
RC=$?
if test $RC = 0 ; then
break
fi
echo "Waiting 5 seconds for slapd to start..."
sleep 5
done
echo "Starting slapd 2 on TCP/IP port $PORT2..."
. $CONFFILTER $BACKEND $MONITORDB < $GLUESYNCCONF2 > $CONF2
$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
@ -66,6 +54,18 @@ KILLPIDS="$KILLPIDS $PID"
sleep 1
echo "Using ldapsearch to check that slapd 1 is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'(objectclass=*)' > /dev/null 2>&1
RC=$?
if test $RC = 0 ; then
break
fi
echo "Waiting 5 seconds for slapd to start..."
sleep 5
done
echo "Using ldapsearch to check that slapd 2 is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
@ -78,8 +78,9 @@ for i in 0 1 2 3 4 5; do
sleep 5
done
echo "Waiting 15 seconds for shadow subtrees to sync..."
sleep 15
SLEEP=15
echo "Waiting $SLEEP seconds for shadow subtrees to sync..."
sleep $SLEEP
for P in $PORT1 $PORT2 ; do
echo "Using ldapsearch to read all the entries from port $P..."