add monitor testing to concurrency tests data

allow easy customization of amount of loops
also check entryCSN
add checkpoint as required

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index cd8e671281b1ff9b447966b6f87b36d450e41c64..399ccc506e4c8a028debce09c17523a06897f577 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -43,7 +43,9 @@ rootdn                "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
+#bdb#checkpoint                1 1
 #hdb#index             objectClass     eq
 #hdb#index             cn,sn,uid       pres,eq,sub
+#hdb#checkpoint                1 1
 
 #monitor#database      monitor

diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c
index f186f670b3380f25a39838613c893cb6a5e9110e..6158b4192d361b36e300ade3b200a77022cc959c 100644 (file)
--- a/tests/progs/slapd-addel.c
+++ b/tests/progs/slapd-addel.c
@@ -427,7 +427,7 @@ retry:;
        }
 
 done:;
-       fprintf( stderr, " PID=%ld - Add/Delete done (%d).\n", (long) pid, rc );
+       fprintf( stderr, "  PID=%ld - Add/Delete done (%d).\n", (long) pid, rc );
 
        ldap_unbind_ext( ld, NULL, NULL );
 }

diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c
index 9bbd6ad0ded94749c4eef54cc873af10e11f719e..f8677200855bb4ad9391dd33a18c4ec7c33f1d92 100644 (file)
--- a/tests/progs/slapd-bind.c
+++ b/tests/progs/slapd-bind.c
@@ -394,7 +394,7 @@ do_bind( char *uri, char *dn, struct berval *pass, int maxloop,
        }
 
        if ( maxloop > 1 ) {
-               fprintf( stderr, " PID=%ld - Bind done (%d).\n", (long) pid, rc );
+               fprintf( stderr, "  PID=%ld - Bind done (%d).\n", (long) pid, rc );
        }
 
        if ( ldp && noinit ) {
@@ -570,7 +570,7 @@ novals:;
        end = GetTickCount();
        end -= beg;
 
-       fprintf( stderr, " PID=%ld - Bind done %d in %d.%03d seconds.\n",
+       fprintf( stderr, "  PID=%ld - Bind done %d in %d.%03d seconds.\n",
                (long) pid, i, end / 1000, end % 1000 );
 #else
        gettimeofday( &end, NULL );
@@ -581,7 +581,7 @@ novals:;
        }
        end.tv_sec -= beg.tv_sec;
 
-       fprintf( stderr, " PID=%ld - Bind done %d in %ld.%06ld seconds.\n",
+       fprintf( stderr, "  PID=%ld - Bind done %d in %ld.%06ld seconds.\n",
                (long) pid, i, (long) end.tv_sec, (long) end.tv_usec );
 #endif
 

diff --git a/tests/progs/slapd-modify.c b/tests/progs/slapd-modify.c
index a58ac7a952c0373d0ed67bb71854e115ce6c8c95..59592b8369ec525490474f45d7480b07c728e73e 100644 (file)
--- a/tests/progs/slapd-modify.c
+++ b/tests/progs/slapd-modify.c
@@ -310,7 +310,7 @@ retry:;
        }
 
 done:;
-       fprintf( stderr, " PID=%ld - Modify done (%d).\n", (long) pid, rc );
+       fprintf( stderr, "  PID=%ld - Modify done (%d).\n", (long) pid, rc );
 
        ldap_unbind_ext( ld, NULL, NULL );
 }

diff --git a/tests/progs/slapd-modrdn.c b/tests/progs/slapd-modrdn.c
index c2bd0fa948b7ac866c77d652f83748e44043c4cf..983b79fbd1139e5a0825262fc469ae8339ff9049 100644 (file)
--- a/tests/progs/slapd-modrdn.c
+++ b/tests/progs/slapd-modrdn.c
@@ -298,7 +298,7 @@ retry:;
        }
 
 done:;
-       fprintf( stderr, " PID=%ld - Modrdn done (%d).\n", (long) pid, rc );
+       fprintf( stderr, "  PID=%ld - Modrdn done (%d).\n", (long) pid, rc );
 
        ldap_unbind_ext( ld, NULL, NULL );
 }

diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index 458dbd3565c61aa07657f6b4a9df3541166e189d..6c29f6bd61854dd5c52d0017218a438a5995d2c2 100644 (file)
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -319,7 +319,7 @@ do_random( char *uri, char *manager, struct berval *passwd,
                break;
        }
 
-       fprintf( stderr, " PID=%ld - Search done (%d).\n", (long) pid, rc );
+       fprintf( stderr, "  PID=%ld - Search done (%d).\n", (long) pid, rc );
 
        if ( ld != NULL ) {
                ldap_unbind_ext( ld, NULL, NULL );
@@ -419,7 +419,7 @@ retry:;
                *ldp = ld;
 
        } else {
-               fprintf( stderr, " PID=%ld - Read done (%d).\n", (long) pid, rc );
+               fprintf( stderr, "  PID=%ld - Read done (%d).\n", (long) pid, rc );
 
                if ( ld != NULL ) {
                        ldap_unbind_ext( ld, NULL, NULL );

diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index 96ecd0363bc0e4e3b23809da4abd04a7baa100cb..367732528b91957c0d2be8ea1236acc6a0051ff2 100644 (file)
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -363,7 +363,7 @@ do_random( char *uri, char *manager, struct berval *passwd,
                break;
        }
 
-       fprintf( stderr, " PID=%ld - Search done (%d).\n", (long) pid, rc );
+       fprintf( stderr, "  PID=%ld - Search done (%d).\n", (long) pid, rc );
 
        if ( ld != NULL ) {
                ldap_unbind_ext( ld, NULL, NULL );
@@ -472,7 +472,7 @@ retry:;
                *ldp = ld;
 
        } else {
-               fprintf( stderr, " PID=%ld - Search done (%d).\n", (long) pid, rc );
+               fprintf( stderr, "  PID=%ld - Search done (%d).\n", (long) pid, rc );
 
                if ( ld != NULL ) {
                        ldap_unbind_ext( ld, NULL, NULL );

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 88900d78a658242f822069f38251cd35e19b3ecf..6f77c0c5bf7538a5d6d4280ba27bd75eb549b74e 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -163,6 +163,8 @@ TOOLPROTO="-P 3"
 LDIFFILTER=$SRCDIR/scripts/acfilter.sh
 CONFFILTER=$SRCDIR/scripts/conf.sh
 
+MONITORDATA=$SRCDIR/scripts/monitor_data.sh
+
 SLAPADD="$TESTWD/../servers/slapd/slapd -Ta -d 0 $LDAP_VERBOSE"
 SLAPCAT="$TESTWD/../servers/slapd/slapd -Tc -d 0 $LDAP_VERBOSE"
 SLAPINDEX="$TESTWD/../servers/slapd/slapd -Ti -d 0 $LDAP_VERBOSE"

diff --git a/tests/scripts/monitor_data.sh b/tests/scripts/monitor_data.sh
new file mode 100755 (executable)
index 0000000..9eef239
--- /dev/null
+++ b/tests/scripts/monitor_data.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2008 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+
+MONITORDB="$1"
+SRCDIR="$2"
+DSTDIR="$3"
+
+echo "MONITORDB $MONITORDB"
+echo "SRCDIR $SRCDIR"
+echo "DSTDIR $DSTDIR"
+echo "pwd `pwd`"
+
+# copy test data
+cp "$SRCDIR"/do_* "$DSTDIR"
+if test $MONITORDB != no ; then
+
+       # add back-monitor testing data
+       cat >> "$DSTDIR/do_search.0" << EOF
+cn=Monitor
+(objectClass=*)
+cn=Monitor
+(objectClass=*)
+cn=Monitor
+(objectClass=*)
+cn=Monitor
+(objectClass=*)
+EOF
+
+       cat >> "$DSTDIR/do_read.0" << EOF
+cn=Backend 1,cn=Backends,cn=Monitor
+cn=Entries,cn=Statistics,cn=Monitor
+cn=Database 1,cn=Databases,cn=Monitor
+EOF
+
+fi
+

diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index c8a34bb80d244c9a3918e839275c024dc4c302a2..0b1654e1d9e301643c4d437b07f884ada827cc76 100755 (executable)
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -16,6 +16,10 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
+if test x$LOOPS = x ; then
+       LOOPS=50
+fi
+
 mkdir -p $TESTDIR $DBDIR1
 
 echo "Running slapadd to build slapd database..."
@@ -50,9 +54,13 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
+# fix test data to include back-monitor, if available
+# NOTE: copies do_* files from $DATADIR to $TESTDIR
+$MONITORDATA "$MONITORDB" "$DATADIR" "$TESTDIR"
+
 echo "Using tester for concurrent server access..."
-time $SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
-#$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
+time $SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l $LOOPS
+#$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l $LOOPS
 RC=$?
 
 if test $RC != 0 ; then

diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index 10565707f10a95204be5e72a663e024d31be3e7c..53687bb76dc3646fc27ec93c02583b4164875aa0 100755 (executable)
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -331,7 +331,7 @@ sleep 25
 
 echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-       'objectclass=*' > $MASTEROUT 2>&1
+       '(objectClass=*)' '*' entryCSN > $MASTEROUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
@@ -342,7 +342,7 @@ fi
 
 echo "Using ldapsearch to read all the entries from the R1 slave..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-       'objectclass=*' > $SERVER2OUT 2>&1
+       '(objectClass=*)' '*' entryCSN > $SERVER2OUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
@@ -353,7 +353,7 @@ fi
 
 echo "Using ldapsearch to read all the entries from the R2 slave..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT3 \
-       'objectclass=*' > $SERVER3OUT 2>&1
+       '(objectClass=*)' '*' entryCSN > $SERVER3OUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
@@ -364,7 +364,7 @@ fi
 
 echo "Using ldapsearch to read all the entries from the P1 slave..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT4 \
-       'objectclass=*' > $SERVER4OUT 2>&1
+       '(objectClass=*)' '*' entryCSN > $SERVER4OUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
@@ -375,7 +375,7 @@ fi
 
 echo "Using ldapsearch to read all the entries from the P2 slave..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT5 \
-       'objectclass=*' > $SERVER5OUT 2>&1
+       '(objectClass=*)' '*' entryCSN > $SERVER5OUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
@@ -386,7 +386,7 @@ fi
 
 echo "Using ldapsearch to read all the entries from the P3 slave..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT6 \
-       'objectclass=*' > $SERVER6OUT 2>&1
+       '(objectClass=*)' '*' entryCSN > $SERVER6OUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then

diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index a42c99d35ed2e32173a78672c3f68360a858d787..8f95c7eb894c4f4c0bbda5371efd194bf841fc9c 100755 (executable)
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -189,8 +189,12 @@ for f in $TESTDIR/$DATADIR/do_bind.* ; do
        echo "" >> $f
 done
 
+# fix test data to include back-monitor, if available
+# NOTE: copies do_* files from $TESTDIR/$DATADIR to $TESTDIR
+$MONITORDATA "$MONITORDB" "$TESTDIR/$DATADIR" "$TESTDIR"
+
 echo "Using tester for concurrent server access..."
-$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT3 \
+$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT3 \
        -D "cn=Manager,$METABASEDN" -w $PASSWD -l $TESTLOOPS -r 20 -FF \
        -i '!REFERRAL'
 RC=$?

diff --git a/tests/scripts/test039-glue-ldap-concurrency b/tests/scripts/test039-glue-ldap-concurrency
index 53a9bb1feca9f2e6fb6eed94588f121595c81c6e..f1038b3eab66e5cab8ae24234fe619eea84a6868 100755 (executable)
--- a/tests/scripts/test039-glue-ldap-concurrency
+++ b/tests/scripts/test039-glue-ldap-concurrency
@@ -177,8 +177,12 @@ for f in $TESTDIR/$DATADIR/do_bind.* ; do
        echo "" >> $f
 done
 
+# fix test data to include back-monitor, if available
+# NOTE: copies do_* files from $TESTDIR/$DATADIR to $TESTDIR
+$MONITORDATA "$MONITORDB" "$TESTDIR/$DATADIR" "$TESTDIR"
+
 echo "Using tester for concurrent server access..."
-$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT3 \
+$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT3 \
        -D "cn=Manager,$METABASEDN" -w $PASSWD \
        -l $TESTLOOPS -L $TESTOLOOPS -r 20 -FF \
        -i '!REFERRAL'

diff --git a/tests/scripts/test050-syncrepl-multimaster b/tests/scripts/test050-syncrepl-multimaster
index 0d4073f745d1534081ec843c696aecf730df064f..bfedef953f8ca3f2bfba5ed5696a1e8cda737ed5 100755 (executable)
--- a/tests/scripts/test050-syncrepl-multimaster
+++ b/tests/scripts/test050-syncrepl-multimaster
@@ -31,6 +31,9 @@ CFPRO=$PRODIR/slapd.d
 CFCON=$CONDIR/slapd.d
 CFCON2=$CONDIR2/slapd.d
 
+SYNCTYPE="type=refreshOnly interval=00:00:00:10"
+#SYNCTYPE="type=refreshAndPersist"
+
 mkdir -p $TESTDIR $PRODIR $CONDIR $CONDIR2 $DBPRO $DBCON $DBCON2 $CFPRO $CFCON $CFCON2
 
 $SLAPPASSWD -g -n >$CONFIGPWF
@@ -38,7 +41,7 @@ $SLAPPASSWD -g -n >$CONFIGPWF
 #
 # Test replication of dynamic config:
 # - start producer
-# - start consumer
+# - start consumer1
 # - start consumer2
 # - configure over ldap
 # - populate over ldap
@@ -175,7 +178,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Starting consumer slapd on TCP/IP port $PORT2..."
+echo "Starting consumer1 slapd on TCP/IP port $PORT2..."
 cd $CONDIR
 $SLAPD -F ./slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
 SLAVEPID=$!
@@ -188,7 +191,7 @@ cd $TESTWD
 
 sleep 1
 
-echo "Using ldapsearch to check that consumer slapd is running..."
+echo "Using ldapsearch to check that consumer1 slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "" -H $URI2 \
                'objectclass=*' > /dev/null 2>&1
@@ -206,7 +209,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Configuring syncrepl on consumer..."
+echo "Configuring syncrepl on consumer1..."
 $LDAPMODIFY -D cn=config -H $URI2 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
 dn: olcDatabase={0}config,cn=config
 changetype: modify
@@ -320,14 +323,14 @@ olcDbDirectory: ./db
 olcRootDN: $MANAGERDN
 olcRootPW: $PASSWD
 olcSyncRepl: rid=004 provider=$URI1 binddn="$MANAGERDN" bindmethod=simple
-  credentials=$PASSWD searchbase="$BASEDN" type=refreshOnly
-  interval=00:00:00:10 retry="5 5 300 5" timeout=3
+  credentials=$PASSWD searchbase="$BASEDN" $SYNCTYPE
+  retry="5 5 300 5" timeout=3
 olcSyncRepl: rid=005 provider=$URI2 binddn="$MANAGERDN" bindmethod=simple
-  credentials=$PASSWD searchbase="$BASEDN" type=refreshOnly
-  interval=00:00:00:10 retry="5 5 300 5" timeout=3
+  credentials=$PASSWD searchbase="$BASEDN" $SYNCTYPE
+  retry="5 5 300 5" timeout=3
 olcSyncRepl: rid=006 provider=$URI3 binddn="$MANAGERDN" bindmethod=simple
-  credentials=$PASSWD searchbase="$BASEDN" type=refreshOnly
-  interval=00:00:00:10 retry="5 5 300 5" timeout=3
+  credentials=$PASSWD searchbase="$BASEDN" $SYNCTYPE
+  retry="5 5 300 5" timeout=3
 olcMirrorMode: TRUE
 
 dn: olcOverlay=syncprov,olcDatabase={1}${BACKEND},cn=config
@@ -357,12 +360,31 @@ SLEEP=20
 echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
 sleep $SLEEP
 
-echo "Using ldapadd to populate consumer..."
+echo "Using ldapadd to populate consumer1..."
 $LDAPADD -D "$MANAGERDN" -H $URI2 -w $PASSWD -f $LDIFADD1 \
        >> $TESTOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
-       echo "ldapadd failed for consumer database ($RC)!"
+       echo "ldapadd failed for consumer1 database ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
+SLEEP=20
+echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
+sleep $SLEEP
+
+echo "Using ldapadd to populate consumer2..."
+$LDAPADD -D "$MANAGERDN" -H $URI3 -w $PASSWD \
+       << EOMODS >> $TESTOUT 2>&1
+dn: cn=Consumer 2 Test,dc=example,dc=com
+changetype: add
+objectClass: device
+cn: Consumer 2 Test
+EOMODS
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapadd failed for consumer2 database ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
 fi
@@ -422,13 +444,13 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Using ldapsearch to read config from the consumer..."
+echo "Using ldapsearch to read config from consumer1..."
 $LDAPSEARCH -b cn=config -D cn=config -H $URI2 -y $CONFIGPWF \
        'objectclass=*' > $SLAVEOUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
-       echo "ldapsearch failed at consumer ($RC)!"
+       echo "ldapsearch failed at consumer1 ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
 fi
@@ -446,16 +468,16 @@ fi
 
 echo "Filtering producer results..."
 . $LDIFFILTER < $MASTEROUT > $MASTERFLT
-echo "Filtering consumer results..."
+echo "Filtering consumer1 results..."
 . $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
 echo "Filtering consumer2 results..."
 . $LDIFFILTER < $SLAVE2OUT > $SLAVE2FLT
 
-echo "Comparing retrieved configs from producer and consumer..."
+echo "Comparing retrieved configs from producer and consumer1..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
 
 if test $? != 0 ; then
-       echo "test failed - producer and consumer configs differ"
+       echo "test failed - producer and consumer1 configs differ"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit 1
 fi
@@ -480,18 +502,18 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Using ldapsearch to read all the entries from the consumer..."
+echo "Using ldapsearch to read all the entries from consumer1..."
 $LDAPSEARCH -S "" -b "$BASEDN" -D "$MANAGERDN" -H $URI2 -w $PASSWD  \
        'objectclass=*' > $SLAVEOUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
-       echo "ldapsearch failed at consumer ($RC)!"
+       echo "ldapsearch failed at consumer1 ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
 fi
 
-echo "Using ldapsearch to read all the entries from the consumer2..."
+echo "Using ldapsearch to read all the entries from consumer2..."
 $LDAPSEARCH -S "" -b "$BASEDN" -D "$MANAGERDN" -H $URI3 -w $PASSWD  \
        'objectclass=*' > $SLAVE2OUT 2>&1
 RC=$?
@@ -502,21 +524,22 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-
-test $KILLSERVERS != no && kill -HUP $KILLPIDS
+# kill!
+# test $KILLSERVERS != no && kill -HUP $KILLPIDS
+kill -HUP $KILLPIDS
 
 echo "Filtering producer results..."
 . $LDIFFILTER < $MASTEROUT > $MASTERFLT
-echo "Filtering consumer results..."
+echo "Filtering consumer1 results..."
 . $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
 echo "Filtering consumer2 results..."
 . $LDIFFILTER < $SLAVE2OUT > $SLAVE2FLT
 
-echo "Comparing retrieved entries from producer and consumer..."
+echo "Comparing retrieved entries from producer and consumer1..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
 
 if test $? != 0 ; then
-       echo "test failed - producer and consumer databases differ"
+       echo "test failed - producer and consumer1 databases differ"
        exit 1
 fi
 
@@ -528,7 +551,9 @@ if test $? != 0 ; then
        exit 1
 fi
 
-test $KILLSERVERS != no && wait
+# kill!
+# test $KILLSERVERS != no && wait
+wait
 
 echo "Restarting servers..."
 echo "Starting producer slapd on TCP/IP port $PORT1..."
@@ -560,7 +585,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 #exit 0
-echo "Starting consumer slapd on TCP/IP port $PORT2..."
+echo "Starting consumer1 slapd on TCP/IP port $PORT2..."
 cd $CONDIR
 echo "======================= RESTART =======================" >> $LOG2
 $SLAPD -F ./slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
@@ -574,7 +599,7 @@ cd $TESTWD
 
 sleep 1
 
-echo "Using ldapsearch to check that consumer slapd is running..."
+echo "Using ldapsearch to check that consumer1 slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "" -H $URI2 \
                'objectclass=*' > /dev/null 2>&1