X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Finit.c;h=4b5f012335680ce0b15eeeceaa1501cfab4fa4db;hb=3a9310431e4e90005c1d7573c2b8f492cbf0cd0d;hp=3fbf91bf6d262b49bb3acb8f5b7377e86ed28132;hpb=888731e6c3a0976d6c0838cd4a60964df0368844;p=openldap
diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 3fbf91bf6d..4b5f012335 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 2000-2005 The OpenLDAP Foundation.
+ * Copyright 2000-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,7 @@
#include
#include
#include "alock.h"
+#include "config.h"
static const struct bdbi_database {
char *file;
@@ -41,10 +42,15 @@ static const struct bdbi_database {
typedef void * db_malloc(size_t);
typedef void * db_realloc(void *, size_t);
+#define bdb_db_init BDB_SYMBOL(db_init)
+#define bdb_db_open BDB_SYMBOL(db_open)
+#define bdb_db_close BDB_SYMBOL(db_close)
+
static int
-bdb_db_init( BackendDB *be )
+bdb_db_init( BackendDB *be, ConfigReply *cr )
{
struct bdb_info *bdb;
+ int rc;
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_db_init) ": Initializing " BDB_UCTYPE " database\n",
@@ -59,6 +65,7 @@ bdb_db_init( BackendDB *be )
bdb->bi_dbenv_mode = SLAPD_DEFAULT_DB_MODE;
bdb->bi_cache.c_maxsize = DEFAULT_CACHE_SIZE;
+ bdb->bi_cache.c_minfree = 1;
bdb->bi_lock_detect = DB_LOCK_DEFAULT;
bdb->bi_search_stack_depth = DEFAULT_SEARCH_STACK_DEPTH;
@@ -69,20 +76,28 @@ bdb_db_init( BackendDB *be )
#ifdef BDB_HIER
ldap_pvt_thread_mutex_init( &bdb->bi_modrdns_mutex );
#endif
- ldap_pvt_thread_mutex_init( &bdb->bi_cache.lru_mutex );
+ ldap_pvt_thread_mutex_init( &bdb->bi_cache.c_lru_mutex );
+ ldap_pvt_thread_mutex_init( &bdb->bi_cache.c_count_mutex );
+ ldap_pvt_thread_mutex_init( &bdb->bi_cache.c_eifree_mutex );
ldap_pvt_thread_mutex_init( &bdb->bi_cache.c_dntree.bei_kids_mutex );
ldap_pvt_thread_rdwr_init ( &bdb->bi_cache.c_rwlock );
ldap_pvt_thread_rdwr_init( &bdb->bi_idl_tree_rwlock );
ldap_pvt_thread_mutex_init( &bdb->bi_idl_tree_lrulock );
+
be->be_private = bdb;
be->be_cf_ocs = be->bd_info->bi_cf_ocs;
- return 0;
+ rc = bdb_monitor_db_init( be );
+
+ return rc;
}
static int
-bdb_db_open( BackendDB *be )
+bdb_db_close( BackendDB *be, ConfigReply *cr );
+
+static int
+bdb_db_open( BackendDB *be, ConfigReply *cr )
{
int rc, i;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
@@ -90,23 +105,28 @@ bdb_db_open( BackendDB *be )
u_int32_t flags;
char path[MAXPATHLEN];
char *dbhome;
- int do_recover = 0, do_alock_recover = 0, open_env = 1, got_env = 0;
+ Entry *e = NULL;
+ int do_recover = 0, do_alock_recover = 0;
+ int alockt, quick = 0;
if ( be->be_suffix == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: need suffix\n",
- 0, 0, 0 );
+ LDAP_XSTRING(bdb_db_open) ": need suffix\n",
+ 1, 0, 0 );
return -1;
}
Debug( LDAP_DEBUG_ARGS,
- "bdb_db_open: %s\n",
+ LDAP_XSTRING(bdb_db_open) ": %s\n",
be->be_suffix[0].bv_val, 0, 0 );
#ifndef BDB_MULTIPLE_SUFFIXES
if ( be->be_suffix[1].bv_val ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: only one suffix allowed\n", 0, 0, 0 );
+ if (cr) {
+ snprintf(cr->msg, sizeof(cr->msg), "only one suffix allowed");
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": %s\n", cr->msg, 0, 0 );
+ }
return -1;
}
#endif
@@ -115,33 +135,41 @@ bdb_db_open( BackendDB *be )
rc = stat( bdb->bi_dbenv_home, &stat1 );
if( rc !=0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: Cannot access database directory %s (%d)\n",
+ LDAP_XSTRING(bdb_db_open) ": Cannot access database directory %s (%d)\n",
bdb->bi_dbenv_home, errno, 0 );
- return -1;
+ return -1;
}
/* Perform database use arbitration/recovery logic */
+ alockt = (slapMode & SLAP_TOOL_READONLY) ? ALOCK_LOCKED : ALOCK_UNIQUE;
+ if ( slapMode & SLAP_TOOL_QUICK ) {
+ alockt |= ALOCK_NOSAVE;
+ quick = 1;
+ }
+
rc = alock_open( &bdb->bi_alock_info,
"slapd",
- bdb->bi_dbenv_home,
- slapMode & SLAP_TOOL_READONLY ?
- ALOCK_LOCKED : ALOCK_UNIQUE );
+ bdb->bi_dbenv_home, alockt );
+
+ /* alockt is TRUE if the existing environment was created in Quick mode */
+ alockt = (rc & ALOCK_NOSAVE) ? 1 : 0;
+ rc &= ~ALOCK_NOSAVE;
if( rc == ALOCK_RECOVER ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: unclean shutdown detected;"
+ LDAP_XSTRING(bdb_db_open) ": unclean shutdown detected;"
" attempting recovery.\n",
0, 0, 0 );
do_alock_recover = 1;
- do_recover = 1;
+ do_recover = DB_RECOVER;
} else if( rc == ALOCK_BUSY ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: database already in use\n",
+ LDAP_XSTRING(bdb_db_open) ": database already in use\n",
0, 0, 0 );
return -1;
} else if( rc != ALOCK_CLEAN ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: alock package is unstable\n",
+ LDAP_XSTRING(bdb_db_open) ": alock package is unstable\n",
0, 0, 0 );
return -1;
}
@@ -157,30 +185,82 @@ bdb_db_open( BackendDB *be )
*ptr++ = LDAP_DIRSEP[0];
strcpy( ptr, "__db.001" );
if( stat( path, &stat2 ) == 0 ) {
- if( stat2.st_mtime <= stat1.st_mtime ) {
+ if( stat2.st_mtime < stat1.st_mtime ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: DB_CONFIG for suffix %s has changed.\n"
+ LDAP_XSTRING(bdb_db_open) ": DB_CONFIG for suffix %s has changed.\n"
"Performing database recovery to activate new settings.\n",
be->be_suffix[0].bv_val, 0, 0 );
- do_recover = 1;
+ do_recover = DB_RECOVER;
}
}
}
}
else {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: Warning - No DB_CONFIG file found "
+ LDAP_XSTRING(bdb_db_open) ": Warning - No DB_CONFIG file found "
"in directory %s: (%d)\n"
"Expect poor performance for suffix %s.\n",
bdb->bi_dbenv_home, errno, be->be_suffix[0].bv_val );
}
+ /* Always let slapcat run, regardless of environment state.
+ * This can be used to cause a cache flush after an unclean
+ * shutdown.
+ */
+ if ( do_recover && ( slapMode & SLAP_TOOL_READONLY )) {
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": Recovery skipped in read-only mode. "
+ "Run manual recovery if errors are encountered.\n",
+ 0, 0, 0 );
+ do_recover = 0;
+ quick = alockt;
+ }
+
+ /* An existing environment in Quick mode has nothing to recover. */
+ if ( alockt && do_recover ) {
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": cannot recover, database must be reinitialized.\n",
+ 0, 0, 0 );
+ rc = -1;
+ goto fail;
+ }
+
rc = db_env_create( &bdb->bi_dbenv, 0 );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: db_env_create failed: %s (%d)\n",
+ LDAP_XSTRING(bdb_db_open) ": db_env_create failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
- return rc;
+ goto fail;
+ }
+
+#ifdef HAVE_EBCDIC
+ strcpy( path, bdb->bi_dbenv_home );
+ __atoe( path );
+ dbhome = path;
+#else
+ dbhome = bdb->bi_dbenv_home;
+#endif
+
+ /* If existing environment is clean but doesn't support
+ * currently requested modes, remove it.
+ */
+ if ( !do_recover && ( alockt ^ quick )) {
+shm_retry:
+ rc = bdb->bi_dbenv->remove( bdb->bi_dbenv, dbhome, DB_FORCE );
+ if ( rc ) {
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": dbenv remove failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+ bdb->bi_dbenv = NULL;
+ goto fail;
+ }
+ rc = db_env_create( &bdb->bi_dbenv, 0 );
+ if( rc != 0 ) {
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": db_env_create failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+ goto fail;
+ }
}
bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
@@ -196,203 +276,65 @@ bdb_db_open( BackendDB *be )
bdb->bi_dbenv_xflags, 1);
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
+ LDAP_XSTRING(bdb_db_open) ": dbenv_set_flags failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
- return rc;
+ goto fail;
}
}
#define BDB_TXN_FLAGS (DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN)
-#ifdef HAVE_EBCDIC
- strcpy( path, bdb->bi_dbenv_home );
- __atoe( path );
- dbhome = path;
-#else
- dbhome = bdb->bi_dbenv_home;
-#endif
-
Debug( LDAP_DEBUG_TRACE,
- "bdb_db_open: dbenv_open(%s)\n",
+ LDAP_XSTRING(bdb_db_open) ": dbenv_open(%s)\n",
bdb->bi_dbenv_home, 0, 0);
- /* Check if there is a usable existing environment */
- flags = DB_JOINENV | DB_THREAD;
-
- rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome,
- flags, bdb->bi_dbenv_mode );
- if( rc == 0 ) {
- int flags_ok = 0;
-
- got_env = 1;
+ flags = DB_INIT_MPOOL | DB_CREATE | DB_THREAD;
- rc = bdb->bi_dbenv->get_open_flags( bdb->bi_dbenv, &flags );
- if ( rc == 0 ) {
- int flag2 = flags & BDB_TXN_FLAGS;
+ if ( !quick )
+ flags |= BDB_TXN_FLAGS;
- /* In quick mode, none of these flags are allowed */
- if ( slapMode & SLAP_TOOL_QUICK ) {
- if ( !flag2 )
- flags_ok = 1;
- } else {
- /* In normal mode, all of these flags are required */
- if ( flag2 == BDB_TXN_FLAGS )
- flags_ok = 1;
- }
- }
-
- /* In Quick mode, we cannot Recover... */
- if ( slapMode & SLAP_TOOL_QUICK ) {
- /* If we need to recover but we had no TXNs, just fail */
- if ( do_recover && flags_ok ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: Database cannot be recovered. "
- "Restore from backup!\n", 0, 0, 0);
- return -1;
- }
- /* We need to recover, and we had TXN support before:
- * Close this env, open a new one with recovery flags.
- */
- if ( do_recover ) {
- bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
- bdb->bi_dbenv = NULL;
- rc = db_env_create( &bdb->bi_dbenv, 0 );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: db_env_create failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- return rc;
- }
- bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv,
- be->be_suffix[0].bv_val );
- bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
- rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome,
- flags | DB_RECOVER, bdb->bi_dbenv_mode );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: recovery failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- return rc;
- }
- do_recover = 0;
- }
- /* Prev environment had TXN support, get rid of it */
- if ( !flags_ok ) {
- bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
- bdb->bi_dbenv = NULL;
- rc = db_env_create( &bdb->bi_dbenv, 0 );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: db_env_create failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- return rc;
- }
- bdb->bi_dbenv->remove( bdb->bi_dbenv, dbhome, 0 );
- bdb->bi_dbenv = NULL;
- }
- /* Normal TXN mode */
- } else {
- /* If we need to recover but we had no TXNs, just fail */
- if ( do_recover && !flags_ok ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: Database cannot be recovered. "
- "Restore from backup!\n", 0, 0, 0);
- return -1;
- }
- /* Prev environment had no TXN support, close it */
- if ( !flags_ok ) {
- bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
- bdb->bi_dbenv = NULL;
- do_recover = 1;
- }
- }
+ /* If a key was set, use shared memory for the BDB environment */
+ if ( bdb->bi_shm_key ) {
+ bdb->bi_dbenv->set_shm_key( bdb->bi_dbenv, bdb->bi_shm_key );
+ flags |= DB_SYSTEM_MEM;
+ }
+ rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome,
+ flags | do_recover, bdb->bi_dbenv_mode );
- if ( flags_ok && !do_recover ) {
- /* This environment is fine, don't reopen it */
- open_env = 0;
- } else {
- /* Create a new env that can take the desired settings */
- if ( bdb->bi_dbenv != NULL ) {
- bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
- bdb->bi_dbenv = NULL;
- }
+ if ( rc ) {
+ /* Regular open faied, probably a missing shm environment.
+ * Start over, do a recovery.
+ */
+ if ( !do_recover && bdb->bi_shm_key ) {
+ bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
rc = db_env_create( &bdb->bi_dbenv, 0 );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: db_env_create failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- return rc;
- }
-
- bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
- bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
- bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
-
- /* One long-lived TXN per thread, two TXNs per write op */
- bdb->bi_dbenv->set_tx_max( bdb->bi_dbenv, connection_pool_max * 3 );
-
- if( bdb->bi_dbenv_xflags != 0 ) {
- rc = bdb->bi_dbenv->set_flags( bdb->bi_dbenv,
- bdb->bi_dbenv_xflags, 1);
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- return rc;
- }
+ if( rc == 0 ) {
+ Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_db_open)
+ ": Shared memory env open failed, assuming stale env\n",
+ 0, 0, 0 );
+ goto shm_retry;
}
}
- }
-
- /* If we need to recover but there was no existing environment,
- * then we assume that someone has already manually recovered using
- * db_recover. Just ignore it.
- */
- if ( do_recover && !got_env ) {
- do_recover = 0;
- Debug( LDAP_DEBUG_TRACE,
- "bdb_db_open: Recovery needed but environment is missing - "
- "assuming recovery was done manually...\n", 0, 0, 0 );
- }
-
- if ( open_env ) {
- flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE;
- if ( !( slapMode & SLAP_TOOL_QUICK ))
- flags |= BDB_TXN_FLAGS;
-
- if ( do_recover )
- flags |= DB_RECOVER;
-
- /* If a key was set, use shared memory for the BDB environment */
- if ( bdb->bi_shm_key ) {
- bdb->bi_dbenv->set_shm_key( bdb->bi_dbenv, bdb->bi_shm_key );
- flags |= DB_SYSTEM_MEM;
- }
-
- rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome,
- flags, bdb->bi_dbenv_mode );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: dbenv_open failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- return rc;
- }
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": Database cannot be %s, err %d. "
+ "Restore from backup!\n",
+ do_recover ? "recovered" : "opened", rc, 0);
+ goto fail;
}
if ( do_alock_recover && alock_recover (&bdb->bi_alock_info) != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: alock_recover failed\n",
+ LDAP_XSTRING(bdb_db_open) ": alock_recover failed\n",
0, 0, 0 );
- return -1;
+ rc = -1;
+ goto fail;
}
#ifdef SLAP_ZONE_ALLOC
if ( bdb->bi_cache.c_maxsize ) {
bdb->bi_cache.c_zctx = slap_zn_mem_create(
- SLAP_ZONE_INITSIZE,
- SLAP_ZONE_MAXSIZE,
- SLAP_ZONE_DELTA,
- SLAP_ZONE_SIZE);
+ SLAP_ZONE_INITSIZE, SLAP_ZONE_MAXSIZE,
+ SLAP_ZONE_DELTA, SLAP_ZONE_SIZE);
}
#endif
@@ -404,7 +346,7 @@ bdb_db_open( BackendDB *be )
flags = DB_THREAD | bdb->bi_db_opflags;
#ifdef DB_AUTO_COMMIT
- if ( !( slapMode & SLAP_TOOL_QUICK ))
+ if ( !quick )
flags |= DB_AUTO_COMMIT;
#endif
@@ -420,9 +362,9 @@ bdb_db_open( BackendDB *be )
rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: db_create(%s) failed: %s (%d)\n",
+ LDAP_XSTRING(bdb_db_open) ": db_create(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
- return rc;
+ goto fail;
}
if( i == BDB_ID2ENTRY ) {
@@ -481,9 +423,10 @@ bdb_db_open( BackendDB *be )
snprintf( buf, sizeof(buf), "%s/%s",
bdb->bi_dbenv_home, bdbi_databases[i].file );
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: db_open(%s) failed: %s (%d)\n",
+ LDAP_XSTRING(bdb_db_open) ": db_open(%s) failed: %s (%d)\n",
buf, db_strerror(rc), rc );
- return rc;
+ db->bdi_db->close( db->bdi_db, 0 );
+ goto fail;
}
flags &= ~(DB_CREATE | DB_RDONLY);
@@ -498,31 +441,66 @@ bdb_db_open( BackendDB *be )
rc = bdb_last_id( be, NULL );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: last_id(%s) failed: %s (%d)\n",
+ LDAP_XSTRING(bdb_db_open) ": last_id(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
- return rc;
+ goto fail;
}
- if ( !( slapMode & SLAP_TOOL_QUICK )) {
+ if ( !quick ) {
XLOCK_ID(bdb->bi_dbenv, &bdb->bi_cache.c_locker);
}
+ entry_prealloc( bdb->bi_cache.c_maxsize );
+ attr_prealloc( bdb->bi_cache.c_maxsize * 20 );
+
+ /* setup for empty-DN contexts */
+ if ( BER_BVISEMPTY( &be->be_nsuffix[0] )) {
+ rc = bdb_id2entry( be, NULL, 0, 0, &e );
+ }
+ if ( !e ) {
+ e = entry_alloc();
+ e->e_id = 0;
+ ber_dupbv( &e->e_name, (struct berval *)&slap_empty_bv );
+ ber_dupbv( &e->e_nname, (struct berval *)&slap_empty_bv );
+ }
+ e->e_ocflags = SLAP_OC_GLUE|SLAP_OC__END;
+ e->e_private = &bdb->bi_cache.c_dntree;
+ bdb->bi_cache.c_dntree.bei_e = e;
+
+ /* monitor setup */
+ rc = bdb_monitor_db_open( be );
+ if ( rc != 0 ) {
+ goto fail;
+ }
+
bdb->bi_flags |= BDB_IS_OPEN;
return 0;
+
+fail:
+ bdb_db_close( be, NULL );
+ return rc;
}
static int
-bdb_db_close( BackendDB *be )
+bdb_db_close( BackendDB *be, ConfigReply *cr )
{
int rc;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
struct bdb_db_info *db;
bdb_idl_cache_entry_t *entry, *next_entry;
- /* backend_shutdown closes everything, even if not all were opened */
- if ( !( bdb->bi_flags & BDB_IS_OPEN ))
- return 0;
+ /* monitor handling */
+ (void)bdb_monitor_db_close( be );
+
+ {
+ Entry *e = bdb->bi_cache.c_dntree.bei_e;
+ if ( e ) {
+ bdb->bi_cache.c_dntree.bei_e = NULL;
+ e->e_private = NULL;
+ bdb_entry_return( e );
+ }
+ }
bdb->bi_flags &= ~BDB_IS_OPEN;
@@ -542,30 +520,31 @@ bdb_db_close( BackendDB *be )
bdb_cache_release_all (&bdb->bi_cache);
- if ( bdb->bi_idl_cache_max_size ) {
- ldap_pvt_thread_rdwr_wlock ( &bdb->bi_idl_tree_rwlock );
+ if ( bdb->bi_idl_cache_size ) {
avl_free( bdb->bi_idl_tree, NULL );
bdb->bi_idl_tree = NULL;
entry = bdb->bi_idl_lru_head;
- while ( entry != NULL ) {
+ do {
next_entry = entry->idl_lru_next;
if ( entry->idl )
free( entry->idl );
free( entry->kstr.bv_val );
free( entry );
entry = next_entry;
- }
+ } while ( entry != bdb->bi_idl_lru_head );
bdb->bi_idl_lru_head = bdb->bi_idl_lru_tail = NULL;
- ldap_pvt_thread_rdwr_wunlock ( &bdb->bi_idl_tree_rwlock );
- }
-
- if ( !( slapMode & SLAP_TOOL_QUICK ) && bdb->bi_dbenv ) {
- XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker);
- bdb->bi_cache.c_locker = 0;
}
/* close db environment */
if( bdb->bi_dbenv ) {
+ /* Free cache locker if we enabled locking */
+ if ( !( slapMode & SLAP_TOOL_QUICK )) {
+ XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker);
+ bdb->bi_cache.c_locker = 0;
+ }
+#ifdef BDB_REUSE_LOCKERS
+ bdb_locker_flush( bdb->bi_dbenv );
+#endif
/* force a checkpoint, but not if we were ReadOnly,
* and not in Quick mode since there are no transactions there.
*/
@@ -599,17 +578,22 @@ bdb_db_close( BackendDB *be )
}
static int
-bdb_db_destroy( BackendDB *be )
+bdb_db_destroy( BackendDB *be, ConfigReply *cr )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ /* monitor handling */
+ (void)bdb_monitor_db_destroy( be );
+
if( bdb->bi_dbenv_home ) ch_free( bdb->bi_dbenv_home );
if( bdb->bi_db_config_path ) ch_free( bdb->bi_db_config_path );
bdb_attr_index_destroy( bdb );
ldap_pvt_thread_rdwr_destroy ( &bdb->bi_cache.c_rwlock );
- ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.lru_mutex );
+ ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.c_lru_mutex );
+ ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.c_count_mutex );
+ ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.c_eifree_mutex );
ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.c_dntree.bei_kids_mutex );
#ifdef BDB_HIER
ldap_pvt_thread_mutex_destroy( &bdb->bi_modrdns_mutex );
@@ -636,11 +620,12 @@ bdb_back_initialize(
LDAP_CONTROL_MANAGEDSAIT,
LDAP_CONTROL_NOOP,
LDAP_CONTROL_PAGEDRESULTS,
-#ifdef LDAP_CONTROL_SUBENTRIES
+ LDAP_CONTROL_PRE_READ,
+ LDAP_CONTROL_POST_READ,
LDAP_CONTROL_SUBENTRIES,
-#endif
-#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
LDAP_CONTROL_X_PERMISSIVE_MODIFY,
+#ifdef LDAP_X_TXN
+ LDAP_CONTROL_X_TXN_SPEC,
#endif
NULL
};
@@ -652,9 +637,7 @@ bdb_back_initialize(
bi->bi_flags |=
SLAP_BFLAG_INCREMENT |
-#ifdef BDB_SUBENTRIES
SLAP_BFLAG_SUBENTRIES |
-#endif
SLAP_BFLAG_ALIASES |
SLAP_BFLAG_REFERRALS;