Commit 76e15b6e authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#6365 wait for read locks in tool mode

Fix commit e5b96f2c
parent f6045423
......@@ -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 );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment