From 6c9b5aa01bb027d69f6e14a663ddcf4d7eac6d57 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 21 Jan 2011 17:10:12 +0000 Subject: [PATCH] ITS#6794 Testcase for multi-threaded slapadd -q --- tests/data/regressions/its6794/its6794 | 84 +++++++++++++++++++ .../data/regressions/its6794/slapd-glue.conf | 75 +++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100755 tests/data/regressions/its6794/its6794 create mode 100644 tests/data/regressions/its6794/slapd-glue.conf diff --git a/tests/data/regressions/its6794/its6794 b/tests/data/regressions/its6794/its6794 new file mode 100755 index 0000000000..80e841daa6 --- /dev/null +++ b/tests/data/regressions/its6794/its6794 @@ -0,0 +1,84 @@ +#! /bin/sh +# $OpenLDAP$ +## This work is part of OpenLDAP Software . +## +## Copyright 1998-2011 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 +## . + +echo "running defines.sh" +. $SRCDIR/scripts/defines.sh + +rm -rf $TESTDIR + +mkdir -p $TESTDIR $DBDIR1A $DBDIR1B $DBDIR1C +ITS=6794 +ITSDIR=$DATADIR/regressions/its$ITS +ITSCONF=$ITSDIR/slapd-glue.conf + +echo "Running multi-threaded slapadd in quick mode to build glued slapd databases..." +. $CONFFILTER $BACKEND $MONITORDB < $ITSCONF > $CONF1 +$SLAPADD -q -d $LVL -f $CONF1 -l $LDIFORDERED > $SLAPADDLOG1 2>&1 +RC=$? +if test $RC != 0 ; then + echo "slapadd failed ($RC)!" + exit $RC +fi + +echo "Starting slapd on TCP/IP port $PORT1..." +$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" + +sleep 1 + +echo "Using ldapsearch to retrieve all the entries..." +for i in 0 1 2 3 4 5; do + $LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 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 "Filtering ldapsearch results..." +$LDIFFILTER -s ldif=e < $SEARCHOUT > $SEARCHFLT +echo "Filtering original ldif used to create database..." +$LDIFFILTER -s ldif=e < $LDIFGLUED > $LDIFFLT +echo "Comparing filter output..." +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT + +if test $? != 0 ; then + echo "comparison failed - database was not created correctly" + echo $SEARCHFLT $LDIFFLT + $DIFF $SEARCHFLT $LDIFFLT + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit 1 +fi + +test $KILLSERVERS != no && kill -HUP $KILLPIDS + +echo ">>>>> Test succeeded" + +test $KILLSERVERS != no && wait + +exit 0 diff --git a/tests/data/regressions/its6794/slapd-glue.conf b/tests/data/regressions/its6794/slapd-glue.conf new file mode 100644 index 0000000000..01a109fa2a --- /dev/null +++ b/tests/data/regressions/its6794/slapd-glue.conf @@ -0,0 +1,75 @@ +# stand-alone slapd config -- for backglue testing (with indexing) +# $OpenLDAP$ +## This work is part of OpenLDAP Software . +## +## Copyright 1998-2011 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 +## . + +include @SCHEMADIR@/core.schema +include @SCHEMADIR@/cosine.schema +include @SCHEMADIR@/inetorgperson.schema +include @SCHEMADIR@/openldap.schema +include @SCHEMADIR@/nis.schema +pidfile @TESTDIR@/slapd.1.pid +argsfile @TESTDIR@/slapd.1.args + +#mod#modulepath ../servers/slapd/back-@BACKEND@/ +#mod#moduleload back_@BACKEND@.la +#monitormod#modulepath ../servers/slapd/back-monitor/ +#monitormod#moduleload back_monitor.la +tool-threads 4 +####################################################################### +# database definitions +####################################################################### + +database @BACKEND@ +suffix "ou=Information Technology Division,ou=People,dc=example,dc=com" +subordinate +rootdn "cn=Manager, dc=example,dc=com" +#~null~#directory @TESTDIR@/db.1.a +#bdb#index objectclass eq +#bdb#index uid pres,eq,sub +#bdb#index cn,sn pres,eq,sub,subany +#hdb#index objectclass eq +#hdb#index uid pres,eq,sub +#hdb#index cn,sn pres,eq,sub,subany +#ndb#dbname db_1 +#ndb#include @DATADIR@/ndb.conf + +database @BACKEND@ +suffix "ou=Groups,dc=example,dc=com" +subordinate +rootdn "cn=Manager, dc=example,dc=com" +#~null~#directory @TESTDIR@/db.1.b +#bdb#index objectclass eq +#bdb#index uid pres,eq,sub +#bdb#index cn,sn pres,eq,sub,subany +#hdb#index objectclass eq +#hdb#index uid pres,eq,sub +#hdb#index cn,sn pres,eq,sub,subany +#ndb#dbname db_2 +#ndb#include @DATADIR@/ndb.conf + +database @BACKEND@ +suffix "dc=example,dc=com" +rootdn "cn=Manager, dc=example,dc=com" +rootpw secret +#~null~#directory @TESTDIR@/db.1.c +#bdb#index objectclass eq +#bdb#index uid pres,eq,sub +#bdb#index cn pres,eq,sub,subany +#hdb#index objectclass eq +#hdb#index uid pres,eq,sub +#hdb#index cn pres,eq,sub,subany +#ndb#dbname db_3 +#ndb#include @DATADIR@/ndb.conf + +#monitor#database monitor -- 2.39.5