X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=servers%2Fslapd%2Fback-bdb%2Finit.c;h=526fee8ed6c7d4a990c3a52287926cfdb6db9b3f;hb=ee3f05000055619ec6d4eee48b57fa5cb6085127;hp=fcdab9ad2c5108d75be5218d48f7dbbf19d43abd;hpb=55f24ce8f69543f9531ab94618459104c2a8ac0b;p=openldap
diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index fcdab9ad2c..526fee8ed6 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-2006 The OpenLDAP Foundation.
+ * Copyright 2000-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,25 +26,31 @@
#include
#include
#include "alock.h"
+#include "config.h"
static const struct bdbi_database {
char *file;
- char *name;
+ struct berval name;
int type;
int flags;
} bdbi_databases[] = {
- { "id2entry" BDB_SUFFIX, "id2entry", DB_BTREE, 0 },
- { "dn2id" BDB_SUFFIX, "dn2id", DB_BTREE, 0 },
- { NULL, NULL, 0, 0 }
+ { "id2entry" BDB_SUFFIX, BER_BVC("id2entry"), DB_BTREE, 0 },
+ { "dn2id" BDB_SUFFIX, BER_BVC("dn2id"), DB_BTREE, 0 },
+ { NULL, BER_BVNULL, 0, 0 }
};
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",
@@ -55,7 +61,7 @@ bdb_db_init( BackendDB *be )
/* DBEnv parameters */
bdb->bi_dbenv_home = ch_strdup( SLAPD_DEFAULT_DB_DIR );
- bdb->bi_dbenv_xflags = 0;
+ bdb->bi_dbenv_xflags = DB_TIME_NOTGRANTED;
bdb->bi_dbenv_mode = SLAPD_DEFAULT_DB_MODE;
bdb->bi_cache.c_maxsize = DEFAULT_CACHE_SIZE;
@@ -70,8 +76,9 @@ 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_head_mutex );
- ldap_pvt_thread_mutex_init( &bdb->bi_cache.lru_tail_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 );
@@ -80,14 +87,20 @@ bdb_db_init( BackendDB *be )
be->be_private = bdb;
be->be_cf_ocs = be->bd_info->bi_cf_ocs;
- return 0;
+#ifndef BDB_MULTIPLE_SUFFIXES
+ SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_ONE_SUFFIX;
+#endif
+
+ rc = bdb_monitor_db_init( be );
+
+ return rc;
}
static int
-bdb_db_close( BackendDB *be );
+bdb_db_close( BackendDB *be, ConfigReply *cr );
static int
-bdb_db_open( BackendDB *be )
+bdb_db_open( BackendDB *be, ConfigReply *cr )
{
int rc, i;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
@@ -95,35 +108,30 @@ bdb_db_open( BackendDB *be )
u_int32_t flags;
char path[MAXPATHLEN];
char *dbhome;
+ Entry *e = NULL;
int do_recover = 0, do_alock_recover = 0;
int alockt, quick = 0;
+ int do_retry = 1;
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 );
- return -1;
- }
-#endif
-
/* Check existence of dbenv_home. Any error means trouble */
rc = stat( bdb->bi_dbenv_home, &stat1 );
- if( rc !=0 ) {
+ if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: Cannot access database directory %s (%d)\n",
- bdb->bi_dbenv_home, errno, 0 );
- return -1;
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "cannot access database directory \"%s\" (%d).\n",
+ be->be_suffix[0].bv_val, bdb->bi_dbenv_home, errno );
+ return -1;
}
/* Perform database use arbitration/recovery logic */
@@ -143,22 +151,26 @@ bdb_db_open( BackendDB *be )
if( rc == ALOCK_RECOVER ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: unclean shutdown detected;"
- " attempting recovery.\n",
- 0, 0, 0 );
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "unclean shutdown detected; attempting recovery.\n",
+ be->be_suffix[0].bv_val, 0, 0 );
do_alock_recover = 1;
do_recover = DB_RECOVER;
} else if( rc == ALOCK_BUSY ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: database already in use\n",
- 0, 0, 0 );
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "database already in use.\n",
+ be->be_suffix[0].bv_val, 0, 0 );
return -1;
} else if( rc != ALOCK_CLEAN ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: alock package is unstable\n",
- 0, 0, 0 );
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "alock package is unstable.\n",
+ be->be_suffix[0].bv_val, 0, 0 );
return -1;
}
+ if ( rc == ALOCK_CLEAN )
+ be->be_flags |= SLAP_DBFLAG_CLEAN;
/*
* The DB_CONFIG file may have changed. If so, recover the
@@ -173,9 +185,20 @@ bdb_db_open( BackendDB *be )
if( stat( path, &stat2 ) == 0 ) {
if( stat2.st_mtime < stat1.st_mtime ) {
Debug( LDAP_DEBUG_ANY,
- "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 );
+ LDAP_XSTRING(bdb_db_open) ": DB_CONFIG for suffix \"%s\" has changed.\n",
+ be->be_suffix[0].bv_val, 0, 0 );
+ if ( quick ) {
+ Debug( LDAP_DEBUG_ANY,
+ "Cannot use Quick mode; perform manual recovery first.\n",
+ 0, 0, 0 );
+ slapMode ^= SLAP_TOOL_QUICK;
+ rc = -1;
+ goto fail;
+ } else {
+ Debug( LDAP_DEBUG_ANY,
+ "Performing database recovery to activate new settings.\n",
+ 0, 0, 0 );
+ }
do_recover = DB_RECOVER;
}
}
@@ -183,9 +206,9 @@ bdb_db_open( BackendDB *be )
}
else {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: Warning - No DB_CONFIG file found "
- "in directory %s: (%d)\n"
- "Expect poor performance for suffix %s.\n",
+ 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 );
}
@@ -195,18 +218,21 @@ bdb_db_open( BackendDB *be )
*/
if ( do_recover && ( slapMode & SLAP_TOOL_READONLY )) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: Recovery skipped in read-only mode. "
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "recovery skipped in read-only mode. "
"Run manual recovery if errors are encountered.\n",
- 0, 0, 0 );
+ be->be_suffix[0].bv_val, 0, 0 );
do_recover = 0;
+ do_alock_recover = 0;
quick = alockt;
}
/* An existing environment in Quick mode has nothing to recover. */
if ( alockt && do_recover ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: cannot recover, database must be reinitialized.\n",
- 0, 0, 0 );
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "cannot recover, database must be reinitialized.\n",
+ be->be_suffix[0].bv_val, 0, 0 );
rc = -1;
goto fail;
}
@@ -214,8 +240,9 @@ bdb_db_open( BackendDB *be )
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 );
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "db_env_create failed: %s (%d).\n",
+ be->be_suffix[0].bv_val, db_strerror(rc), rc );
goto fail;
}
@@ -231,19 +258,22 @@ bdb_db_open( BackendDB *be )
* 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,
- "bdb_db_open: dbenv remove failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "dbenv remove failed: %s (%d).\n",
+ be->be_suffix[0].bv_val, db_strerror(rc), rc );
bdb->bi_dbenv = NULL;
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",
- db_strerror(rc), rc, 0 );
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "db_env_create failed: %s (%d).\n",
+ be->be_suffix[0].bv_val, db_strerror(rc), rc );
goto fail;
}
}
@@ -253,6 +283,18 @@ bdb_db_open( BackendDB *be )
bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
+ if ( !BER_BVISNULL( &bdb->bi_db_crypt_key )) {
+ rc = bdb->bi_dbenv->set_encrypt( bdb->bi_dbenv, bdb->bi_db_crypt_key.bv_val,
+ DB_ENCRYPT_AES );
+ if ( rc ) {
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "dbenv set_encrypt failed: %s (%d).\n",
+ be->be_suffix[0].bv_val, db_strerror(rc), rc );
+ goto fail;
+ }
+ }
+
/* One long-lived TXN per thread, two TXNs per write op */
bdb->bi_dbenv->set_tx_max( bdb->bi_dbenv, connection_pool_max * 3 );
@@ -261,8 +303,9 @@ 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",
- db_strerror(rc), rc, 0 );
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "dbenv_set_flags failed: %s (%d).\n",
+ be->be_suffix[0].bv_val, db_strerror(rc), rc );
goto fail;
}
}
@@ -270,8 +313,9 @@ bdb_db_open( BackendDB *be )
#define BDB_TXN_FLAGS (DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN)
Debug( LDAP_DEBUG_TRACE,
- "bdb_db_open: dbenv_open(%s)\n",
- bdb->bi_dbenv_home, 0, 0);
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "dbenv_open(%s).\n",
+ be->be_suffix[0].bv_val, bdb->bi_dbenv_home, 0);
flags = DB_INIT_MPOOL | DB_CREATE | DB_THREAD;
@@ -283,21 +327,36 @@ bdb_db_open( BackendDB *be )
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,
+ rc = (bdb->bi_dbenv->open)( bdb->bi_dbenv, dbhome,
flags | do_recover, bdb->bi_dbenv_mode );
if ( rc ) {
+ /* Regular open failed, probably a missing shm environment.
+ * Start over, do a recovery.
+ */
+ if ( !do_recover && bdb->bi_shm_key && do_retry ) {
+ bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
+ rc = db_env_create( &bdb->bi_dbenv, 0 );
+ if( rc == 0 ) {
+ Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_db_open)
+ ": database \"%s\": "
+ "shared memory env open failed, assuming stale env.\n",
+ be->be_suffix[0].bv_val, 0, 0 );
+ do_retry = 0;
+ goto shm_retry;
+ }
+ }
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: Database cannot be %s, err %d. "
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\" cannot be %s, err %d. "
"Restore from backup!\n",
- do_recover ? "recovered" : "opened", rc, 0);
+ be->be_suffix[0].bv_val, do_recover ? "recovered" : "opened", rc );
goto fail;
}
if ( do_alock_recover && alock_recover (&bdb->bi_alock_info) != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: alock_recover failed\n",
- 0, 0, 0 );
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": alock_recover failed\n",
+ be->be_suffix[0].bv_val, 0, 0 );
rc = -1;
goto fail;
}
@@ -310,6 +369,13 @@ bdb_db_open( BackendDB *be )
}
#endif
+ /* dncache defaults to 0 == unlimited
+ * must be >= entrycache
+ */
+ if ( bdb->bi_cache.c_eimax && bdb->bi_cache.c_eimax < bdb->bi_cache.c_maxsize ) {
+ bdb->bi_cache.c_eimax = bdb->bi_cache.c_maxsize;
+ }
+
if ( bdb->bi_idl_cache_max_size ) {
bdb->bi_idl_tree = NULL;
bdb->bi_idl_cache_size = 0;
@@ -326,32 +392,71 @@ bdb_db_open( BackendDB *be )
BDB_INDICES * sizeof(struct bdb_db_info *) );
/* open (and create) main database */
- for( i = 0; bdbi_databases[i].name; i++ ) {
+ for( i = 0; bdbi_databases[i].name.bv_val; i++ ) {
struct bdb_db_info *db;
db = (struct bdb_db_info *) ch_calloc(1, sizeof(struct bdb_db_info));
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",
+ snprintf(cr->msg, sizeof(cr->msg),
+ "database \"%s\": db_create(%s) failed: %s (%d).",
+ be->be_suffix[0].bv_val,
bdb->bi_dbenv_home, db_strerror(rc), rc );
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": %s\n",
+ cr->msg, 0, 0 );
goto fail;
}
+ if( !BER_BVISNULL( &bdb->bi_db_crypt_key )) {
+ rc = db->bdi_db->set_flags( db->bdi_db, DB_ENCRYPT );
+ if ( rc ) {
+ snprintf(cr->msg, sizeof(cr->msg),
+ "database \"%s\": db set_flags(DB_ENCRYPT)(%s) failed: %s (%d).",
+ be->be_suffix[0].bv_val,
+ bdb->bi_dbenv_home, db_strerror(rc), rc );
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": %s\n",
+ cr->msg, 0, 0 );
+ goto fail;
+ }
+ }
+
+ if( bdb->bi_flags & BDB_CHKSUM ) {
+ rc = db->bdi_db->set_flags( db->bdi_db, DB_CHKSUM );
+ if ( rc ) {
+ snprintf(cr->msg, sizeof(cr->msg),
+ "database \"%s\": db set_flags(DB_CHKSUM)(%s) failed: %s (%d).",
+ be->be_suffix[0].bv_val,
+ bdb->bi_dbenv_home, db_strerror(rc), rc );
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": %s\n",
+ cr->msg, 0, 0 );
+ goto fail;
+ }
+ }
+
+ rc = bdb_db_findsize( bdb, (struct berval *)&bdbi_databases[i].name );
+
if( i == BDB_ID2ENTRY ) {
+ if ( !rc ) rc = BDB_ID2ENTRY_PAGESIZE;
+ rc = db->bdi_db->set_pagesize( db->bdi_db, rc );
+
if ( slapMode & SLAP_TOOL_MODE )
db->bdi_db->mpf->set_priority( db->bdi_db->mpf,
DB_PRIORITY_VERY_LOW );
- rc = db->bdi_db->set_pagesize( db->bdi_db,
- BDB_ID2ENTRY_PAGESIZE );
if ( slapMode & SLAP_TOOL_READMAIN ) {
flags |= DB_RDONLY;
} else {
flags |= DB_CREATE;
}
} else {
+ /* Use FS default size if not configured */
+ if ( rc )
+ rc = db->bdi_db->set_pagesize( db->bdi_db, rc );
+
rc = db->bdi_db->set_flags( db->bdi_db,
DB_DUP | DB_DUPSORT );
#ifndef BDB_HIER
@@ -361,14 +466,14 @@ bdb_db_open( BackendDB *be )
flags |= DB_CREATE;
}
#else
+ rc = db->bdi_db->set_dup_compare( db->bdi_db,
+ bdb_dup_compare );
if ( slapMode & (SLAP_TOOL_READONLY|SLAP_TOOL_READMAIN) ) {
flags |= DB_RDONLY;
} else {
flags |= DB_CREATE;
}
#endif
- rc = db->bdi_db->set_pagesize( db->bdi_db,
- BDB_PAGESIZE );
}
#ifdef HAVE_EBCDIC
@@ -390,13 +495,14 @@ bdb_db_open( BackendDB *be )
#endif
if ( rc != 0 ) {
- char buf[SLAP_TEXT_BUFLEN];
-
- snprintf( buf, sizeof(buf), "%s/%s",
- bdb->bi_dbenv_home, bdbi_databases[i].file );
+ snprintf( cr->msg, sizeof(cr->msg), "database \"%s\": "
+ "db_open(%s/%s) failed: %s (%d).",
+ be->be_suffix[0].bv_val,
+ bdb->bi_dbenv_home, bdbi_databases[i].file,
+ db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: db_open(%s) failed: %s (%d)\n",
- buf, db_strerror(rc), rc );
+ LDAP_XSTRING(bdb_db_open) ": %s\n",
+ cr->msg, 0, 0 );
db->bdi_db->close( db->bdi_db, 0 );
goto fail;
}
@@ -412,52 +518,107 @@ bdb_db_open( BackendDB *be )
/* get nextid */
rc = bdb_last_id( be, NULL );
if( rc != 0 ) {
+ snprintf( cr->msg, sizeof(cr->msg), "database \"%s\": "
+ "last_id(%s) failed: %s (%d).",
+ be->be_suffix[0].bv_val, bdb->bi_dbenv_home,
+ db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: last_id(%s) failed: %s (%d)\n",
- bdb->bi_dbenv_home, db_strerror(rc), rc );
+ LDAP_XSTRING(bdb_db_open) ": %s\n",
+ cr->msg, 0, 0 );
goto fail;
}
if ( !quick ) {
- XLOCK_ID(bdb->bi_dbenv, &bdb->bi_cache.c_locker);
+ TXN_BEGIN(bdb->bi_dbenv, NULL, &bdb->bi_cache.c_txn, DB_READ_COMMITTED | DB_TXN_NOWAIT);
+ }
+
+ 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, &e );
+ }
+ if ( !e ) {
+ struct berval gluebv = BER_BVC("glue");
+ Operation op = {0};
+ Opheader ohdr = {0};
+ 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 );
+ attr_merge_one( e, slap_schema.si_ad_objectClass,
+ &gluebv, NULL );
+ attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
+ &gluebv, NULL );
+ op.o_hdr = &ohdr;
+ op.o_bd = be;
+ op.ora_e = e;
+ op.o_dn = be->be_rootdn;
+ op.o_ndn = be->be_rootndn;
+ slap_add_opattrs( &op, NULL, NULL, 0, 0 );
}
+ 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_open( be );
+ rc = bdb_monitor_db_open( be );
if ( rc != 0 ) {
goto fail;
}
bdb->bi_flags |= BDB_IS_OPEN;
- entry_prealloc( bdb->bi_cache.c_maxsize );
- attr_prealloc( bdb->bi_cache.c_maxsize * 20 );
return 0;
fail:
- bdb_db_close( be );
+ 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;
+ /* 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;
ber_bvarray_free( bdb->bi_db_config );
bdb->bi_db_config = NULL;
+ if( bdb->bi_dbenv ) {
+ /* Free cache locker if we enabled locking.
+ * TXNs must all be closed before DBs...
+ */
+ if ( !( slapMode & SLAP_TOOL_QUICK ) && bdb->bi_cache.c_txn ) {
+ TXN_ABORT( bdb->bi_cache.c_txn );
+ bdb->bi_cache.c_txn = NULL;
+ }
+ bdb_reader_flush( bdb->bi_dbenv );
+ }
+
while( bdb->bi_databases && bdb->bi_ndatabases-- ) {
db = bdb->bi_databases[bdb->bi_ndatabases];
rc = db->bdi_db->close( db->bdi_db, 0 );
/* Lower numbered names are not strdup'd */
if( bdb->bi_ndatabases >= BDB_NDB )
- free( db->bdi_name );
+ free( db->bdi_name.bv_val );
free( db );
}
free( bdb->bi_databases );
@@ -465,29 +626,23 @@ bdb_db_close( BackendDB *be )
bdb_cache_release_all (&bdb->bi_cache);
- if ( bdb->bi_idl_cache_max_size ) {
+ 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;
}
/* 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;
- }
-
/* force a checkpoint, but not if we were ReadOnly,
* and not in Quick mode since there are no transactions there.
*/
@@ -495,8 +650,9 @@ bdb_db_close( BackendDB *be )
rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_close: txn_checkpoint failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ "bdb_db_close: database \"%s\": "
+ "txn_checkpoint failed: %s (%d).\n",
+ be->be_suffix[0].bv_val, db_strerror(rc), rc );
}
}
@@ -504,16 +660,18 @@ bdb_db_close( BackendDB *be )
bdb->bi_dbenv = NULL;
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_close: close failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ "bdb_db_close: database \"%s\": "
+ "close failed: %s (%d)\n",
+ be->be_suffix[0].bv_val, db_strerror(rc), rc );
return rc;
}
}
- rc = alock_close( &bdb->bi_alock_info );
+ rc = alock_close( &bdb->bi_alock_info, slapMode & SLAP_TOOL_QUICK );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_close: alock_close failed\n", 0, 0, 0 );
+ "bdb_db_close: database \"%s\": alock_close failed\n",
+ be->be_suffix[0].bv_val, 0, 0 );
return -1;
}
@@ -521,18 +679,33 @@ 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;
+ /* stop and remove checkpoint task */
+ if ( bdb->bi_txn_cp_task ) {
+ struct re_s *re = bdb->bi_txn_cp_task;
+ bdb->bi_txn_cp_task = NULL;
+ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+ if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re ) )
+ ldap_pvt_runqueue_stoptask( &slapd_rq, re );
+ ldap_pvt_runqueue_remove( &slapd_rq, re );
+ ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+ }
+
+ /* 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_head_mutex );
- ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.lru_tail_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 );
@@ -615,9 +788,10 @@ bdb_back_initialize(
db_env_set_func_free( ber_memfree );
db_env_set_func_malloc( (db_malloc *)ber_memalloc );
db_env_set_func_realloc( (db_realloc *)ber_memrealloc );
-#ifndef NO_THREAD
+#if !defined(NO_THREAD) && DB_VERSION_FULL <= 0x04070000
/* This is a no-op on a NO_THREAD build. Leave the default
* alone so that BDB will sleep on interprocess conflicts.
+ * Don't bother on BDB 4.7...
*/
db_env_set_func_yield( ldap_pvt_thread_yield );
#endif
@@ -656,27 +830,19 @@ bdb_back_initialize(
*/
bi->bi_tool_entry_open = bdb_tool_entry_open;
bi->bi_tool_entry_close = bdb_tool_entry_close;
- bi->bi_tool_entry_first = bdb_tool_entry_next;
+ bi->bi_tool_entry_first = backend_tool_entry_first;
+ bi->bi_tool_entry_first_x = bdb_tool_entry_first_x;
bi->bi_tool_entry_next = bdb_tool_entry_next;
bi->bi_tool_entry_get = bdb_tool_entry_get;
bi->bi_tool_entry_put = bdb_tool_entry_put;
bi->bi_tool_entry_reindex = bdb_tool_entry_reindex;
bi->bi_tool_sync = 0;
bi->bi_tool_dn2id_get = bdb_tool_dn2id_get;
- bi->bi_tool_id2entry_get = bdb_tool_id2entry_get;
bi->bi_tool_entry_modify = bdb_tool_entry_modify;
bi->bi_connection_init = 0;
bi->bi_connection_destroy = 0;
- /*
- * initialize monitor stuff
- */
- rc = bdb_monitor_initialize();
- if ( rc ) {
- return rc;
- }
-
rc = bdb_back_init_cf( bi );
return rc;