/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * 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
#include <ac/string.h>
#include <ac/unistd.h>
#include <ac/stdlib.h>
-
+#include <ac/errno.h>
+#include <sys/stat.h>
#include "back-bdb.h"
#include <lutil.h>
#include <ldap_rq.h>
+#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_ANY,
- LDAP_XSTRING(bdb_db_init) ": Initializing "
- BDB_UCTYPE " database\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE,
+ LDAP_XSTRING(bdb_db_init) ": Initializing " BDB_UCTYPE " database\n",
+ 0, 0, 0 );
/* allocate backend-database-specific stuff */
bdb = (struct bdb_info *) ch_calloc( 1, sizeof(struct bdb_info) );
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;
ldap_pvt_thread_mutex_init( &bdb->bi_database_mutex );
ldap_pvt_thread_mutex_init( &bdb->bi_lastid_mutex );
- ldap_pvt_thread_mutex_init( &bdb->bi_cache.lru_mutex );
+#ifdef BDB_HIER
+ ldap_pvt_thread_mutex_init( &bdb->bi_modrdns_mutex );
+#endif
+ 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_table = be->bd_info->bi_cf_table;
+ be->be_cf_ocs = be->bd_info->bi_cf_ocs;
- return 0;
-}
+#ifndef BDB_MULTIPLE_SUFFIXES
+ SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_ONE_SUFFIX;
+#endif
-static void *
-bdb_checkpoint( void *ctx, void *arg )
-{
- struct re_s *rtask = arg;
- struct bdb_info *bdb = rtask->arg;
-
- TXN_CHECKPOINT( bdb->bi_dbenv, bdb->bi_txn_cp_kbyte,
- bdb->bi_txn_cp_min, 0 );
- return NULL;
+ 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;
+ struct stat stat1, stat2;
u_int32_t flags;
-#ifdef HAVE_EBCDIC
char path[MAXPATHLEN];
-#endif
+ char *dbhome;
+ Entry *e = NULL;
+ int do_recover = 0, do_alock_recover = 0;
+ int alockt, quick = 0;
+
+ if ( be->be_suffix == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ 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 );
+ /* Check existence of dbenv_home. Any error means trouble */
+ rc = stat( bdb->bi_dbenv_home, &stat1 );
+ if( rc != 0 ) {
+ Debug( LDAP_DEBUG_ANY,
+ 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;
}
-#endif
- /* we should check existance of dbenv_home and db_directory */
- 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;
+ /* 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;
}
- flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE;
+ rc = alock_open( &bdb->bi_alock_info,
+ "slapd",
+ bdb->bi_dbenv_home, alockt );
- if ( !( slapMode & SLAP_TOOL_QUICK ))
- flags |= DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN;
-
-#if 0
- /* Never do automatic recovery, must perform it manually.
- * Otherwise restarting with gentlehup will corrupt the
- * database.
- */
- if( !(slapMode & SLAP_TOOL_MODE) ) flags |= DB_RECOVER;
-#endif
+ /* alockt is TRUE if the existing environment was created in Quick mode */
+ alockt = (rc & ALOCK_NOSAVE) ? 1 : 0;
+ rc &= ~ALOCK_NOSAVE;
- /* 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;
+ if( rc == ALOCK_RECOVER ) {
+ Debug( LDAP_DEBUG_ANY,
+ 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,
+ 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,
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
+ "alock package is unstable.\n",
+ be->be_suffix[0].bv_val, 0, 0 );
+ return -1;
}
- 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 );
+ /*
+ * The DB_CONFIG file may have changed. If so, recover the
+ * database so that new settings are put into effect. Also
+ * note the possible absence of DB_CONFIG in the log.
+ */
+ if( stat( bdb->bi_db_config_path, &stat1 ) == 0 ) {
+ if ( !do_recover ) {
+ char *ptr = lutil_strcopy(path, bdb->bi_dbenv_home);
+ *ptr++ = LDAP_DIRSEP[0];
+ strcpy( ptr, "__db.001" );
+ if( stat( path, &stat2 ) == 0 ) {
+ if( stat2.st_mtime < stat1.st_mtime ) {
+ Debug( LDAP_DEBUG_ANY,
+ 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;
+ }
+ }
+ }
+ }
+ else {
+ Debug( LDAP_DEBUG_ANY,
+ 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 );
+ }
- /* One long-lived TXN per thread, two TXNs per write op */
- bdb->bi_dbenv->set_tx_max( bdb->bi_dbenv, connection_pool_max * 3 );
+ /* 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) ": database \"%s\": "
+ "recovery skipped in read-only mode. "
+ "Run manual recovery if errors are encountered.\n",
+ be->be_suffix[0].bv_val, 0, 0 );
+ do_recover = 0;
+ quick = alockt;
+ }
-#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);
+ /* An existing environment in Quick mode has nothing to recover. */
+ if ( alockt && do_recover ) {
+ Debug( LDAP_DEBUG_ANY,
+ 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;
}
-#endif
- if ( bdb->bi_idl_cache_max_size ) {
- bdb->bi_idl_tree = NULL;
- ldap_pvt_thread_rdwr_init( &bdb->bi_idl_tree_rwlock );
- ldap_pvt_thread_mutex_init( &bdb->bi_idl_tree_lrulock );
- bdb->bi_idl_cache_size = 0;
+ rc = db_env_create( &bdb->bi_dbenv, 0 );
+ if( rc != 0 ) {
+ Debug( LDAP_DEBUG_ANY,
+ 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;
}
-#ifdef BDB_SUBDIRS
- {
- char dir[MAXPATHLEN], *ptr;
-
- if (bdb->bi_dbenv_home[0] == '.') {
- /* If home is a relative path, relative subdirs
- * are just concat'd by BDB. We don't want the
- * path to be concat'd twice, e.g.
- * ./test-db/./test-db/tmp
- */
- ptr = dir;
- } else {
- ptr = lutil_strcopy( dir, bdb->bi_dbenv_home );
- *ptr++ = LDAP_DIRSEP[0];
#ifdef HAVE_EBCDIC
- __atoe( dir );
+ strcpy( path, bdb->bi_dbenv_home );
+ __atoe( path );
+ dbhome = path;
+#else
+ dbhome = bdb->bi_dbenv_home;
#endif
- }
- strcpy( ptr, BDB_TMP_SUBDIR );
-#ifdef HAVE_EBCDIC
- __atoe( ptr );
-#endif
- rc = bdb->bi_dbenv->set_tmp_dir( bdb->bi_dbenv, dir );
- if( rc != 0 ) {
+ /* 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,
- "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n",
- dir, db_strerror(rc), rc );
- return rc;
+ 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;
}
-
- strcpy( ptr, BDB_LG_SUBDIR );
-#ifdef HAVE_EBCDIC
- __atoe( ptr );
-#endif
- rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir );
+ rc = db_env_create( &bdb->bi_dbenv, 0 );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n",
- dir, db_strerror(rc), rc );
- return rc;
+ 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;
}
+ }
- strcpy( ptr, BDB_DATA_SUBDIR );
-#ifdef HAVE_EBCDIC
- __atoe( ptr );
-#endif
- rc = bdb->bi_dbenv->set_data_dir( bdb->bi_dbenv, dir );
- if( rc != 0 ) {
+ 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 );
+
+ 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,
- "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
- dir, db_strerror(rc), rc );
- return rc;
+ 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;
}
}
-#endif
+
+ /* 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;
+ 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;
}
}
+#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);
-#ifdef HAVE_EBCDIC
- strcpy( path, bdb->bi_dbenv_home );
- __atoe( path );
- rc = bdb->bi_dbenv->open( bdb->bi_dbenv,
- path,
- flags,
- bdb->bi_dbenv_mode );
-#else
- rc = bdb->bi_dbenv->open( bdb->bi_dbenv,
- bdb->bi_dbenv_home,
- flags,
- bdb->bi_dbenv_mode );
-#endif
- if( rc != 0 ) {
+ flags = DB_INIT_MPOOL | DB_CREATE | DB_THREAD;
+
+ if ( !quick )
+ flags |= BDB_TXN_FLAGS;
+
+ /* 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 ( rc ) {
+ /* Regular open failed, 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, LDAP_XSTRING(bdb_db_open)
+ ": database \"%s\": "
+ "shared memory env open failed, assuming stale env.\n",
+ be->be_suffix[0].bv_val, 0, 0 );
+ goto shm_retry;
+ }
+ }
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\" cannot be %s, err %d. "
+ "Restore from backup!\n",
+ 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: dbenv_open failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- return rc;
+ LDAP_XSTRING(bdb_db_open) ": database \"%s\": alock_recover failed\n",
+ be->be_suffix[0].bv_val, 0, 0 );
+ 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);
+ }
+#endif
+
+ /* Default dncache to 2x entrycache */
+ if ( bdb->bi_cache.c_maxsize && !bdb->bi_cache.c_eimax ) {
+ bdb->bi_cache.c_eimax = bdb->bi_cache.c_maxsize * 2;
+ }
+
+ if ( bdb->bi_idl_cache_max_size ) {
+ bdb->bi_idl_tree = NULL;
+ bdb->bi_idl_cache_size = 0;
}
flags = DB_THREAD | bdb->bi_db_opflags;
#ifdef DB_AUTO_COMMIT
- if ( !( slapMode & SLAP_TOOL_QUICK ))
+ if ( !quick )
flags |= DB_AUTO_COMMIT;
#endif
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 );
- return 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( i == BDB_ID2ENTRY ) {
+ 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_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 {
#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 );
- return rc;
+ LDAP_XSTRING(bdb_db_open) ": %s\n",
+ cr->msg, 0, 0 );
+ db->bdi_db->close( db->bdi_db, 0 );
+ goto fail;
}
flags &= ~(DB_CREATE | DB_RDONLY);
/* 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 );
- return rc;
+ LDAP_XSTRING(bdb_db_open) ": %s\n",
+ cr->msg, 0, 0 );
+ goto fail;
}
- if ( !( slapMode & SLAP_TOOL_QUICK )) {
+ if ( !quick ) {
+#if DB_VERSION_FULL >= 0x04060012
+ u_int32_t lid;
+ XLOCK_ID(bdb->bi_dbenv, &lid);
+ __lock_getlocker(bdb->bi_dbenv->lk_handle, lid, 0, &bdb->bi_cache.c_locker);
+#else
XLOCK_ID(bdb->bi_dbenv, &bdb->bi_cache.c_locker);
+#endif
}
- /* If we're in server mode and time-based checkpointing is enabled,
- * submit a task to perform periodic checkpoints.
- */
- if ( slapMode & SLAP_SERVER_MODE && bdb->bi_txn_cp &&
- bdb->bi_txn_cp_min ) {
- ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
- ldap_pvt_runqueue_insert( &slapd_rq, bdb->bi_txn_cp_min*60,
- bdb_checkpoint, bdb );
- ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+ 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;
- while( bdb->bi_ndatabases-- ) {
+ /* 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;
+
+ 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 );
- bdb_attr_index_destroy( bdb->bi_attrs );
+ bdb->bi_databases = NULL;
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;
- }
- ldap_pvt_thread_rdwr_wunlock ( &bdb->bi_idl_tree_rwlock );
- }
-
- if ( !( slapMode & SLAP_TOOL_QUICK )) {
- XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker);
+ } while ( entry != bdb->bi_idl_lru_head );
+ bdb->bi_idl_lru_head = bdb->bi_idl_lru_tail = NULL;
}
- return 0;
-}
-
-static int
-bdb_db_destroy( BackendDB *be )
-{
- int rc;
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-
/* close db environment */
if( bdb->bi_dbenv ) {
- /* force a checkpoint */
+ /* Free cache locker if we enabled locking */
if ( !( slapMode & SLAP_TOOL_QUICK )) {
+#if DB_VERSION_FULL >= 0x04060012
+ XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker->id);
+#else
+ XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker);
+#endif
+ 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.
+ */
+ if ( !( slapMode & ( SLAP_TOOL_QUICK|SLAP_TOOL_READONLY ))) {
rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_destroy: 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 );
}
}
bdb->bi_dbenv = NULL;
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "bdb_db_destroy: 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, slapMode & SLAP_TOOL_QUICK );
+ if( rc != 0 ) {
+ Debug( LDAP_DEBUG_ANY,
+ "bdb_db_close: database \"%s\": alock_close failed\n",
+ be->be_suffix[0].bv_val, 0, 0 );
+ return -1;
+ }
+
+ return 0;
+}
+
+static int
+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 );
+#endif
ldap_pvt_thread_mutex_destroy( &bdb->bi_lastid_mutex );
ldap_pvt_thread_mutex_destroy( &bdb->bi_database_mutex );
- if ( bdb->bi_idl_cache_max_size ) {
- ldap_pvt_thread_rdwr_destroy( &bdb->bi_idl_tree_rwlock );
- ldap_pvt_thread_mutex_destroy( &bdb->bi_idl_tree_lrulock );
- }
+ ldap_pvt_thread_rdwr_destroy( &bdb->bi_idl_tree_rwlock );
+ ldap_pvt_thread_mutex_destroy( &bdb->bi_idl_tree_lrulock );
ch_free( bdb );
be->be_private = NULL;
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
};
bi->bi_flags |=
SLAP_BFLAG_INCREMENT |
-#ifdef BDB_SUBENTRIES
SLAP_BFLAG_SUBENTRIES |
-#endif
SLAP_BFLAG_ALIASES |
SLAP_BFLAG_REFERRALS;
#endif
ver = (major << 24) | (minor << 16) | patch;
- if( ver < DB_VERSION_FULL )
- {
+ if( ver != DB_VERSION_FULL ) {
+ /* fail if a versions don't match */
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_back_initialize) ": "
"BDB library version mismatch:"
" expected " DB_VERSION_STRING ","
" got %s\n", version, 0, 0 );
+ return -1;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_back_initialize)
bi->bi_destroy = 0;
bi->bi_db_init = bdb_db_init;
- bi->bi_db_config = bdb_db_config;
+ bi->bi_db_config = config_generic_wrapper;
bi->bi_db_open = bdb_db_open;
bi->bi_db_close = bdb_db_close;
bi->bi_db_destroy = bdb_db_destroy;
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;
- rc = bdb_back_init_cf(bi);
+ rc = bdb_back_init_cf( bi );
return rc;
}
projects / openldap / blobdiff