X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest036-meta-concurrency;h=26063ed901f00164fe027c245348b23ecb97dfe2;hb=fc1396fa2e94ee2e752fd7c3ea5bb22f6592398a;hp=d430732638be13369703645656feee7a1d04e546;hpb=637df0ba906dccf26a3eaf02fa559fabb2bd1e19;p=openldap diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency index d430732638..26063ed901 100755 --- a/tests/scripts/test036-meta-concurrency +++ b/tests/scripts/test036-meta-concurrency @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2005 The OpenLDAP Foundation. +## Copyright 1998-2012 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -23,29 +23,41 @@ if test $BACKMETA = metano ; then exit 0 fi -if test "x$TEST_META" != "xyes" ; then - echo "### this test is currently disabled;" - echo "### set \"TEST_META=yes\" to enable (at own risk)." +if test $BACKLDAP = ldapno ; then + echo "ldap backend not available, test skipped" exit 0 -else - echo "### this test is __very__ experimental; enable at own risk" +fi + +if test x$TESTLOOPS = x ; then + TESTLOOPS=50 +fi + +if test x$TESTCHILDREN = x ; then + TESTCHILDREN=20 fi rm -rf $TESTDIR mkdir -p $TESTDIR $DBDIR1 $DBDIR2 -if test "x$DB_CONFIG" != "x" -a -f $DB_CONFIG ; then - echo "==> using DB_CONFIG $DB_CONFIG" - cp $DB_CONFIG $DBDIR1 - cp $DB_CONFIG $DBDIR2 -else - echo "==> set \"DB_CONFIG\" to the location of the DB_CONFIG file" - echo "==> you want to use for the test." +# NOTE: this could be added to all tests... +if test "$BACKEND" = "bdb" || test "$BACKEND" = "hdb" ; then + if test "x$DB_CONFIG" != "x" ; then \ + if test -f $DB_CONFIG ; then + echo "==> using DB_CONFIG \"$DB_CONFIG\"" + cp $DB_CONFIG $DBDIR1 + cp $DB_CONFIG $DBDIR2 + else + echo "==> DB_CONFIG must point to a valid file (ignored)" + fi + else + echo "==> set \"DB_CONFIG\" to the DB_CONFIG file you want to use for the test." + fi + echo "" fi echo "Starting slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1 +. $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -54,6 +66,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$PID" +sleep 1 + echo "Using ldapsearch to check that slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ @@ -82,7 +96,7 @@ if test $RC != 0 ; then fi echo "Starting slapd on TCP/IP port $PORT2..." -. $CONFFILTER $BACKEND $MONITORDB < $METACONF > $CONF2 +. $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -91,6 +105,8 @@ if test $WAIT != 0 ; then fi KILLPIDS="$KILLPIDS $PID" +sleep 1 + echo "Using ldapsearch to check that slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ @@ -118,6 +134,35 @@ if test $RC != 0 ; then exit $RC fi +echo "Starting slapd on TCP/IP port $PORT3..." +. $CONFFILTER $BACKEND $MONITORDB < $METACONF > $CONF3 +$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 & +PID=$! +if test $WAIT != 0 ; then + echo PID $PID + read foo +fi +KILLPIDS="$KILLPIDS $PID" + +sleep 1 + +echo "Using ldapsearch to check that slapd is running..." +for i in 0 1 2 3 4 5; do + $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \ + 'objectclass=*' > /dev/null 2>&1 + RC=$? + if test $RC = 0 ; then + break + fi + echo "Waiting 5 seconds for slapd to start..." + sleep 5 +done +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + cat /dev/null > $SEARCHOUT mkdir -p $TESTDIR/$DATADIR @@ -126,12 +171,38 @@ for f in $DATADIR/do_* ; do sed -e "s;$BASEDN;$METABASEDN;" $f > $TESTDIR/$f done +# add a read that matches only the local database, but selects +# also the remote as candidate; this should be removed to compare +# execution times with test008... for f in $TESTDIR/$DATADIR/do_read.* ; do echo "ou=Meta,$METABASEDN" >> $f done +# add a read that matches a referral in the local database only, +# but selects also the remote as candidate; this should be removed +# to compare execution times with test008... +for f in $TESTDIR/$DATADIR/do_read.* ; do + echo "cn=Somewhere,ou=Meta,$METABASEDN" >> $f +done + +# add a bind that resolves to a referral +for f in $TESTDIR/$DATADIR/do_bind.* ; do + echo "cn=Foo,ou=Meta,$METABASEDN" >> $f + echo "bar" >> $f + echo "" >> $f + 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" + +BINDDN="cn=Manager,o=Local" +PASSWD="secret" echo "Using tester for concurrent server access..." -$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT2 -D "cn=Manager,$METABASEDN" -w $PASSWD -l 100 -r 20 +$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT3 \ + -D "$BINDDN" -w $PASSWD -l $TESTLOOPS -j $TESTCHILDREN \ + -r 20 -i '!REFERRAL' -i '*INVALID_CREDENTIALS' -SS RC=$? if test $RC != 0 ; then @@ -141,7 +212,7 @@ if test $RC != 0 ; then fi echo "Using ldapsearch to retrieve all the entries..." -$LDAPSEARCH -S "" -b "$METABASEDN" -h $LOCALHOST -p $PORT2 \ +$LDAPSEARCH -S "" -b "$METABASEDN" -h $LOCALHOST -p $PORT3 \ 'objectClass=*' > $SEARCHOUT 2>&1 RC=$? @@ -153,17 +224,19 @@ if test $RC != 0 ; then fi echo "Filtering ldapsearch results..." -. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT +$LDIFFILTER < $SEARCHOUT > $SEARCHFLT echo "Filtering original ldif used to create database..." -. $LDIFFILTER < $METACONCURRENCYOUT > $LDIFFLT +$LDIFFILTER < $METACONCURRENCYOUT > $LDIFFLT echo "Comparing filter output..." $CMP $SEARCHFLT $LDIFFLT > $CMPOUT - + if test $? != 0 ; then - echo "comparison failed - meta search/modification didn't succeed" + echo "comparison failed - slapd-meta search/modification didn't succeed" exit 1 fi echo ">>>>> Test succeeded" -exit 0 +test $KILLSERVERS != no && wait + +exit 0