sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r18979: With these extra indexes (also added for the normal case) and a

Browse Source 
DB_CONFIG file, we now get reasonable enought performance to pass
'make test' against OpenLDAP.

We do have to double the maximum runtime for the torture client however.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2006-09-28 17:08:17 +00:00 committed by Gerald (Jerry) Carter
parent a113e47784
commit 5b3c8cc036
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/script/tests/mktestsetup.sh
View File

@ -71,7 +71,7 @@ export SERVER
export NETBIOSNAME export NETBIOSNAME
rm -rf $PREFIX/* rm -rf $PREFIX/*
mkdir -p $PRIVATEDIR $ETCDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR $LDAPDIR/db mkdir -p $PRIVATEDIR $ETCDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR $LDAPDIR/db $LDAPDIR/db/bdb-logs $LDAPDIR/db/tmp
if [ -z "$VALGRIND" ]; then if [ -z "$VALGRIND" ]; then
nativeiconv="true" nativeiconv="true"
@ -339,9 +339,11 @@ index uidNumber eq
index gidNumber eq index gidNumber eq
index unixName eq index unixName eq
index privilege eq index privilege eq
index nCName eq index nCName eq pres
index lDAPDisplayName eq index lDAPDisplayName eq
index subClassOf eq index subClassOf eq
index dnsRoot eq
index nETBIOSName eq pres
overlay syncprov overlay syncprov
syncprov-checkpoint 100 10 syncprov-checkpoint 100 10
@ -349,6 +351,33 @@ syncprov-sessionlog 100
EOF EOF
cat > $LDAPDIR/db/DB_CONFIG <<EOF
#
# Set the database in memory cache size.
#
set_cachesize 0 524288 0
#
# Set database flags (this is a test environment, we don't need to fsync()).
#
set_flags DB_TXN_NOSYNC
#
# Set log values.
#
set_lg_regionmax 104857
set_lg_max 1048576
set_lg_bsize 209715
set_lg_dir $LDAPDIR/db/bdb-logs
#
# Set temporary file creation directory.
#
set_tmp_dir $LDAPDIR/db/tmp
EOF
PROVISION_OPTIONS="$CONFIGURATION --host-name=$NETBIOSNAME --host-ip=127.0.0.1" PROVISION_OPTIONS="$CONFIGURATION --host-name=$NETBIOSNAME --host-ip=127.0.0.1"
PROVISION_OPTIONS="$PROVISION_OPTIONS --quiet --domain $DOMAIN --realm $REALM" PROVISION_OPTIONS="$PROVISION_OPTIONS --quiet --domain $DOMAIN --realm $REALM"
PROVISION_OPTIONS="$PROVISION_OPTIONS --adminpass $PASSWORD --root=$ROOT" PROVISION_OPTIONS="$PROVISION_OPTIONS --adminpass $PASSWORD --root=$ROOT"

2
source/script/tests/selftest.sh
View File

@ -69,6 +69,8 @@ if [ x"$TEST_LDAP" = x"yes" ]; then
echo "LDAP PROVISIONING failed: $srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS --ldap-backend=$LDAPI" echo "LDAP PROVISIONING failed: $srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS --ldap-backend=$LDAPI"
exit 1; exit 1;
} }
#LDAP is slow
TORTURE_MAXTIME=`expr $TORTURE_MAXTIME '*' 2`
fi fi
SMBD_TEST_FIFO="$PREFIX/smbd_test.fifo" SMBD_TEST_FIFO="$PREFIX/smbd_test.fifo"

2
source/setup/provision_init.ldif
View File

@ -12,6 +12,8 @@ dn: @INDEXLIST
@IDXATTR: nCName @IDXATTR: nCName
@IDXATTR: lDAPDisplayName @IDXATTR: lDAPDisplayName
@IDXATTR: subClassOf @IDXATTR: subClassOf
@IDXATTR: dnsRoot
@IDXATTR: nETBIOSName
dn: @ATTRIBUTES dn: @ATTRIBUTES
userPrincipalName: CASE_INSENSITIVE userPrincipalName: CASE_INSENSITIVE