mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-24 00:29:35 -05:00
add new glued ldap concurrency test
This commit is contained in:
Pierangelo Masarati
parent
9146b262ad
commit
a1d407c3d2
4 changed files with 277 additions and 1 deletions
76
tests/data/slapd-glue-ldap.conf
Normal file
76
tests/data/slapd-glue-ldap.conf
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
# master slapd config -- for testing
|
||||
# $OpenLDAP$
|
||||
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||
##
|
||||
## Copyright 1998-2005 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>.
|
||||
|
||||
include ./schema/core.schema
|
||||
include ./schema/cosine.schema
|
||||
include ./schema/inetorgperson.schema
|
||||
include ./schema/openldap.schema
|
||||
include ./schema/nis.schema
|
||||
include ./schema/ppolicy.schema
|
||||
pidfile ./test-db/slapd.m.pid
|
||||
argsfile ./test-db/slapd.m.args
|
||||
|
||||
#mod#modulepath ../servers/slapd/back-@BACKEND@/
|
||||
#mod#moduleload back_@BACKEND@.la
|
||||
#relaymod#modulepath ../servers/slapd/back-relay/
|
||||
#relaymod#moduleload back_relay.la
|
||||
#ldapmod#modulepath ../servers/slapd/back-ldap/
|
||||
#ldapmod#moduleload back_ldap.la
|
||||
#metamod#modulepath ../servers/slapd/back-meta/
|
||||
#metamod#moduleload back_meta.la
|
||||
#monitormod#modulepath ../servers/slapd/back-monitor/
|
||||
#monitormod#moduleload back_monitor.la
|
||||
#rwmmod#modulepath ../servers/slapd/overlays/
|
||||
#rwmmod#moduleload rwm.la
|
||||
|
||||
overlay rwm
|
||||
rwm-suffixmassage "o=Example,c=US" "dc=example,dc=com"
|
||||
|
||||
#######################################################################
|
||||
# database definitions
|
||||
#######################################################################
|
||||
|
||||
# remote
|
||||
database ldap
|
||||
suffix "ou=Meta,dc=example,dc=com"
|
||||
uri "@URI2@"
|
||||
rootdn "cn=Manager,dc=example,dc=com"
|
||||
chase-referrals no
|
||||
idassert-bind bindmethod=simple
|
||||
binddn="cn=Manager,ou=Meta,dc=example,dc=com"
|
||||
credentials="secret"
|
||||
mode=none
|
||||
flags=non-prescriptive
|
||||
idassert-authzfrom "dn.exact:cn=Manager,dc=example,dc=com"
|
||||
|
||||
# local
|
||||
database ldap
|
||||
suffix "dc=example,dc=com"
|
||||
uri "@URI1@"
|
||||
rootdn "cn=Manager,dc=example,dc=com"
|
||||
rootpw secret
|
||||
chase-referrals no
|
||||
idassert-bind bindmethod=simple
|
||||
binddn="cn=Manager,dc=example,dc=com"
|
||||
credentials="secret"
|
||||
mode=none
|
||||
flags=non-prescriptive
|
||||
idassert-authzfrom "dn.exact:cn=Manager,dc=example,dc=com"
|
||||
|
||||
|
||||
overlay glue
|
||||
glue-sub "ou=Meta,dc=example,dc=com"
|
||||
|
||||
#monitor#database monitor
|
||||
|
|
@ -93,6 +93,7 @@ TRANSLUCENTLOCALCONF=$DATADIR/slapd-translucent-local.conf
|
|||
TRANSLUCENTREMOTECONF=$DATADIR/slapd-translucent-remote.conf
|
||||
METACONF=$DATADIR/slapd-meta.conf
|
||||
METACONF2=$DATADIR/slapd-meta2.conf
|
||||
GLUELDAPCONF=$DATADIR/slapd-glue-ldap.conf
|
||||
|
||||
CONF1=$TESTDIR/slapd.1.conf
|
||||
CONF2=$TESTDIR/slapd.2.conf
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ echo "running defines.sh"
|
|||
. $SRCDIR/scripts/defines.sh
|
||||
|
||||
if test $RWM = rwmno ; then
|
||||
echo "Rewrite/remap overlay not available, test skipped"
|
||||
echo "rwm (Rewrite/remap) overlay not available, test skipped"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
|
|
|||
199
tests/scripts/test039-glue-ldap-concurrency
Executable file
199
tests/scripts/test039-glue-ldap-concurrency
Executable file
|
|
@ -0,0 +1,199 @@
|
|||
#! /bin/sh
|
||||
# $OpenLDAP$
|
||||
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||
##
|
||||
## Copyright 1998-2005 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>.
|
||||
|
||||
echo "running defines.sh"
|
||||
. $SRCDIR/scripts/defines.sh
|
||||
|
||||
echo ""
|
||||
|
||||
if test $BACKLDAP = ldapno ; then
|
||||
echo "ldap backend not available, test skipped"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if test $GLUE = "glueno" ; then
|
||||
echo "glue overlay not available, test skipped"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if test $RWM = rwmno ; then
|
||||
echo "rwm (rewrite/remap) overlay not available, test skipped"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
rm -rf $TESTDIR
|
||||
|
||||
mkdir -p $TESTDIR $DBDIR1 $DBDIR2
|
||||
|
||||
echo "Starting slapd on TCP/IP port $PORT1..."
|
||||
. $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
|
||||
$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
|
||||
PID=$!
|
||||
if test $WAIT != 0 ; then
|
||||
echo PID $PID
|
||||
read foo
|
||||
fi
|
||||
KILLPIDS="$PID"
|
||||
|
||||
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 \
|
||||
'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
|
||||
|
||||
echo "Using ldapadd to populate the database..."
|
||||
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
|
||||
$LDIFORDERED > $TESTOUT 2>&1
|
||||
RC=$?
|
||||
if test $RC != 0 ; then
|
||||
echo "ldapadd failed ($RC)!"
|
||||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
|
||||
echo "Starting slapd on TCP/IP port $PORT2..."
|
||||
. $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
|
||||
$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
|
||||
PID=$!
|
||||
if test $WAIT != 0 ; then
|
||||
echo PID $PID
|
||||
read foo
|
||||
fi
|
||||
KILLPIDS="$KILLPIDS $PID"
|
||||
|
||||
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 \
|
||||
'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
|
||||
|
||||
echo "Using ldapadd to populate the database..."
|
||||
$LDAPADD -D "$METAMANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD < \
|
||||
$LDIFMETA >> $TESTOUT 2>&1
|
||||
RC=$?
|
||||
if test $RC != 0 ; then
|
||||
echo "ldapadd failed ($RC)!"
|
||||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
|
||||
echo "Starting slapd on TCP/IP port $PORT3..."
|
||||
. $CONFFILTER $BACKEND $MONITORDB < $GLUELDAPCONF > $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"
|
||||
|
||||
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
|
||||
METABASEDN="o=Example,c=US"
|
||||
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
|
||||
|
||||
echo "Using tester for concurrent server access..."
|
||||
$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT3 -D "cn=Manager,$METABASEDN" -w $PASSWD -l 50 # -r 20
|
||||
RC=$?
|
||||
|
||||
if test $RC != 0 ; then
|
||||
echo "slapd-tester failed ($RC)!"
|
||||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
|
||||
echo "Using ldapsearch to retrieve all the entries..."
|
||||
$LDAPSEARCH -S "" -b "$METABASEDN" -h $LOCALHOST -p $PORT3 \
|
||||
'(objectClass=*)' > $SEARCHOUT 2>&1
|
||||
RC=$?
|
||||
|
||||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
if test $RC != 0 ; then
|
||||
echo "ldapsearch failed ($RC)!"
|
||||
exit $RC
|
||||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $METACONCURRENCYOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
if test $? != 0 ; then
|
||||
echo "comparison failed - meta search/modification didn't succeed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo ">>>>> Test succeeded"
|
||||
exit 0
|
||||
|
||||
Loading…
Reference in a new issue