From: Howard Chu <hyc@openldap.org>
Date: Sat, 23 Oct 2010 12:02:29 +0000 (+0000)
Subject: Try again...
X-Git-Tag: MIGRATION_CVS2GIT~449
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=31ad1085d66dfdb6c5968cd636524789f24bca55;p=openldap

Try again...
---

diff --git a/tests/scripts/test060-mt-hot b/tests/scripts/test060-mt-hot
deleted file mode 100755
index fff6c72505..0000000000
--- a/tests/scripts/test060-mt-hot
+++ /dev/null
@@ -1,289 +0,0 @@
-#! /bin/sh
-# $OpenLDAP$
-## This work is part of OpenLDAP Software <http://www.openldap.org/>.
-##
-## Copyright 1998-2009 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
-
-mkdir -p $TESTDIR $DBDIR1
-
-#
-# Populate and start up slapd server with some random data
-#
-
-echo "Running slapadd to build slapd database..."
-. $CONFFILTER $BACKEND $MONITORDB < $MCONF > $ADDCONF
-$SLAPADD -f $ADDCONF -l $LDIFORDERED
-RC=$?
-if test $RC != 0 ; then
-	echo "slapadd failed ($RC)!"
-	exit $RC
-fi
-
-echo "Running slapindex to index slapd database..."
-. $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPINDEX -f $CONF1
-RC=$?
-if test $RC != 0 ; then
-	echo "warning: slapindex failed ($RC)"
-	echo "  assuming no indexing support"
-fi
-
-echo "Starting slapd on TCP/IP port $PORT1..."
-echo $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING
-$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
-
-# Perform a basic search, make sure of a functional setup
-echo "Testing basic monitor search..."
-for i in 0 1 2 3 4 5; do
-	$LDAPSEARCH -s base -b "$MONITORDN" -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 "mt-hot read failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-cat /dev/null > $MTREADOUT
-
-echo "Monitor searches"
-# Perform a basic single threaded search on a single connection
-THR=1
-OUTER=1
-INNER=50000
-echo "Testing basic mt-hot search: $THR threads ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" \
-	-m $THR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" -f "(objectclass=*)" \
-	-m $THR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a basic multi-threaded search on a single connection
-THR=5
-OUTER=1
-INNER=10000
-echo "Testing basic mt-hot search: $THR threads ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" \
-	-m $THR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" -f "(objectclass=*)" \
-	-m $THR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a basic multi-threaded search on a single connection
-THR=100
-OUTER=5
-INNER=100
-echo "Testing basic mt-hot search: $THR threads ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" \
-	-m $THR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" -f "(objectclass=*)" \
-	-m $THR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a single threaded random DB search on a single connection
-echo "Random searches"
-THR=1
-OUTER=1
-INNER=50000
-echo "Testing random mt-hot search: $THR threads ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(objectclass=*)" \
-	-m $THR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(objectclass=*)" \
-	-m $THR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a multi-threaded random DB search on a single connection
-THR=5
-OUTER=1
-INNER=10000
-echo "Testing random mt-hot search: $THR threads ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(objectclass=*)" \
-	-m $THR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(objectclass=*)" \
-	-m $THR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a multi-threaded random DB search on a single connection
-THR=100
-OUTER=5
-INNER=100
-echo "Testing random mt-hot search: $THR threads ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(objectclass=*)" \
-	-m $THR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(objectclass=*)" \
-	-m $THR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a basic multi-threaded search using multiple connections
-echo "Multiple threads and connection searches"
-CONN=5
-THR=5
-OUTER=1
-INNER=10000
-echo "Testing basic mt-hot search: $THR threads $CONN conns ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" \
-	-c $CONN -m $THR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" -f "(objectclass=*)" \
-	-c $CONN -m $THR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a basic multi-threaded search using multiple connections
-CONN=5
-THR=50
-OUTER=5
-INNER=1000
-echo "Testing basic mt-hot search: $THR threads $CONN conns ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" \
-	-c $CONN -m $THR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$MONITORDN" -f "(objectclass=*)" \
-	-c $CONN -m $THR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a multi-threaded random DB search using multiple connections
-CONN=5
-THR=100
-OUTER=5
-INNER=100
-echo "Testing random mt-hot search: $THR threads $CONN conns ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(objectclass=*)" \
-	-c $CONN -m $THR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(objectclass=*)" \
-	-c $CONN -m $THR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a multi-threaded random reads and writes using single connection
-CONN=1
-THR=10
-WTHR=10
-OUTER=5
-INNER=100
-echo "Testing random mt-hot r/w search: $THR read threads $WTHR write threads $CONN conns ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(&(!(cn=rwtest*))(objectclass=*))" \
-	-c $CONN -m $THR -M $WTHR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(&(!(cn=rwtest*))(objectclass=*))" \
-	-c $CONN -m $THR -M $WTHR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-# Perform a multi-threaded random reads and writes using multiple connections
-CONN=5
-THR=10
-WTHR=10
-OUTER=5
-INNER=100
-echo "Testing random mt-hot r/w search: $THR read threads $WTHR write threads $CONN conns ($OUTER x $INNER) loops..."
-echo $SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(&(!(cn=rwtest*))(objectclass=*))" \
-	-c $CONN -m $THR -M $WTHR -L $OUTER -l $INNER
-$SLAPDMTREAD -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-	-e "$BASEDN" -f "(&(!(cn=rwtest*))(objectclass=*))" \
-	-c $CONN -m $THR -M $WTHR -L $OUTER -l $INNER >> $MTREADOUT 2>&1
-RC=$?
-if test $RC != 0 ; then
-	echo "slapd-mtread failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-
-test $KILLSERVERS != no && kill -HUP $KILLPIDS
-
-echo ">>>>> Test succeeded"
-
-exit 0