Author: abartlet Date: 2006-09-28 17:08:17 +0000 (Thu, 28 Sep 2006) New Revision: 18979
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18979 Log: With these extra indexes (also added for the normal case) and a 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 Modified: branches/SAMBA_4_0/source/script/tests/mktestsetup.sh branches/SAMBA_4_0/source/script/tests/selftest.sh branches/SAMBA_4_0/source/setup/provision_init.ldif Changeset: Modified: branches/SAMBA_4_0/source/script/tests/mktestsetup.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/mktestsetup.sh 2006-09-28 17:06:38 UTC (rev 18978) +++ branches/SAMBA_4_0/source/script/tests/mktestsetup.sh 2006-09-28 17:08:17 UTC (rev 18979) @@ -71,7 +71,7 @@ export NETBIOSNAME 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 nativeiconv="true" @@ -339,9 +339,11 @@ index gidNumber eq index unixName eq index privilege eq -index nCName eq +index nCName eq pres index lDAPDisplayName eq index subClassOf eq +index dnsRoot eq +index nETBIOSName eq pres overlay syncprov syncprov-checkpoint 100 10 @@ -349,6 +351,33 @@ 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="$PROVISION_OPTIONS --quiet --domain $DOMAIN --realm $REALM" PROVISION_OPTIONS="$PROVISION_OPTIONS --adminpass $PASSWORD --root=$ROOT" Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/selftest.sh 2006-09-28 17:06:38 UTC (rev 18978) +++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2006-09-28 17:08:17 UTC (rev 18979) @@ -69,6 +69,8 @@ echo "LDAP PROVISIONING failed: $srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS --ldap-backend=$LDAPI" exit 1; } + #LDAP is slow + TORTURE_MAXTIME=`expr $TORTURE_MAXTIME '*' 2` fi SMBD_TEST_FIFO="$PREFIX/smbd_test.fifo" Modified: branches/SAMBA_4_0/source/setup/provision_init.ldif =================================================================== --- branches/SAMBA_4_0/source/setup/provision_init.ldif 2006-09-28 17:06:38 UTC (rev 18978) +++ branches/SAMBA_4_0/source/setup/provision_init.ldif 2006-09-28 17:08:17 UTC (rev 18979) @@ -12,6 +12,8 @@ @IDXATTR: nCName @IDXATTR: lDAPDisplayName @IDXATTR: subClassOf [EMAIL PROTECTED]: dnsRoot [EMAIL PROTECTED]: nETBIOSName dn: @ATTRIBUTES userPrincipalName: CASE_INSENSITIVE
