upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6365 wait for read locks in tool mode

Browse source 
Fix commit e5b96f2c76
This commit is contained in:
Howard Chu 2013-02-07 18:23:25 +00:00
parent 1c99711ede
commit 853b9d1335
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/back-bdb/init.c
View file

@ -529,7 +529,13 @@ shm_retry:
}
if ( !quick ) {
TXN_BEGIN(bdb->bi_dbenv, NULL, &bdb->bi_cache.c_txn, DB_READ_COMMITTED | DB_TXN_NOWAIT);
int txflag = DB_READ_COMMITTED;
/* avoid deadlocks in server; tools should
* wait since they have no deadlock retry mechanism.
*/
if ( slapMode & SLAP_SERVER_MODE )
txflag |= DB_TXN_NOWAIT;
TXN_BEGIN(bdb->bi_dbenv, NULL, &bdb->bi_cache.c_txn, txflag);
}
entry_prealloc( bdb->bi_cache.c_maxsize );