X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Finit.c;h=e81e38ab657f5696dc1ecf6ad264bb14e5a0effb;hb=0006ec0a46790567d3d49fcafce5ffaae08cdbf4;hp=a61eeedc6f2d01d73dcfa2f0b4731c78ba96c8ee;hpb=8c758b34f8a52aa1b60bfe94e040fd2f6498abea;p=openldap diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index a61eeedc6f..e81e38ab65 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -1,7 +1,7 @@ /* init.c - initialize bdb backend */ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -9,6 +9,10 @@ #include #include +#include +#include + +#include #include "back-bdb.h" #include "external.h" @@ -18,26 +22,28 @@ static struct bdbi_database { char *name; int type; int flags; -} bdbi_databases[BDB_INDICES] = { - { "nextid" BDB_SUFFIX, "nextid", DB_BTREE, 0 }, - { "dn2entry" BDB_SUFFIX, "dn2entry", DB_BTREE, 0 }, +} bdbi_databases[] = { { "id2entry" BDB_SUFFIX, "id2entry", DB_BTREE, 0 }, +#ifdef BDB_HIER + { "id2parent" BDB_SUFFIX, "id2parent", DB_BTREE, 0 }, +#else + { "dn2id" BDB_SUFFIX, "dn2id", DB_BTREE, 0 }, +#endif + { NULL, NULL, 0, 0 } }; -#if 0 +struct berval bdb_uuid = { 0, NULL }; + static int -bdb_destroy( BackendInfo *bi ) +bdb_open( BackendInfo *bi ) { return 0; } +#if 0 static int -bdb_open( BackendInfo *bi ) +bdb_destroy( BackendInfo *bi ) { - /* initialize the underlying database system */ - Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n", - 0, 0, 0 ); - return 0; } @@ -58,43 +64,96 @@ bdb_db_init( BackendDB *be ) "bdb_db_init: Initializing BDB database\n", 0, 0, 0 ); + /* indicate system schema supported */ + be->be_flags |= +#ifdef BDB_SUBENTRIES + SLAP_BFLAG_SUBENTRIES | +#endif +#ifdef BDB_ALIASES + SLAP_BFLAG_ALIASES | +#endif + SLAP_BFLAG_REFERRALS; + /* allocate backend-database-specific stuff */ bdb = (struct bdb_info *) ch_calloc( 1, sizeof(struct bdb_info) ); /* DBEnv parameters */ - bdb->bi_dbenv_home = ch_strdup( BDB_DBENV_HOME ); + bdb->bi_dbenv_home = ch_strdup( SLAPD_DEFAULT_DB_DIR ); bdb->bi_dbenv_xflags = 0; - bdb->bi_dbenv_mode = DEFAULT_MODE; + bdb->bi_dbenv_mode = SLAPD_DEFAULT_DB_MODE; + + bdb->bi_cache.c_maxsize = DEFAULT_CACHE_SIZE; #ifndef NO_THREADS +#if 0 bdb->bi_lock_detect = DB_LOCK_NORUN; +#else + bdb->bi_lock_detect = DB_LOCK_DEFAULT; +#endif +#endif + + 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.c_mutex ); +#ifdef BDB_HIER + ldap_pvt_thread_rdwr_init( &bdb->bi_tree_rdwr ); #endif be->be_private = bdb; return 0; } -#ifndef NO_THREADS +#if 0 /* ifndef NO_THREADS */ static void *lock_detect_task( void *arg ) { struct bdb_info *bdb = (struct bdb_info *) arg; while( bdb->bi_dbenv != NULL ) { int rc; + int aborted; sleep( bdb->bi_lock_detect_seconds ); - rc = lock_detect( bdb->bi_dbenv, 0, - bdb->bi_lock_detect, NULL ); + rc = LOCK_DETECT( bdb->bi_dbenv, 0, + bdb->bi_lock_detect, &aborted ); if( rc != 0 ) { break; } + + Debug( LDAP_DEBUG_ANY, + "bdb_lock_detect: aborted %d locks\n", + aborted, 0, 0 ); } return NULL; } #endif +int +bdb_bt_compare( + DB *db, + const DBT *usrkey, + const DBT *curkey +) +{ + unsigned char *u, *c; + int i; + + u = usrkey->data; + c = curkey->data; + +#ifdef WORDS_BIGENDIAN + for( i = 0; i < sizeof(ID); i++) +#else + for( i = sizeof(ID)-1; i >= 0; i--) +#endif + { + if( u[i] - c[i] ) + return u[i] - c[i]; + } + return 0; +} + static int bdb_db_open( BackendDB *be ) { @@ -104,7 +163,7 @@ bdb_db_open( BackendDB *be ) Debug( LDAP_DEBUG_ARGS, "bdb_db_open: %s\n", - be->be_suffix[0], 0, 0 ); + be->be_suffix[0]->bv_val, 0, 0 ); /* we should check existance of dbenv_home and db_directory */ @@ -116,11 +175,14 @@ bdb_db_open( BackendDB *be ) return rc; } - flags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | - DB_THREAD | DB_CREATE | DB_RECOVER; + flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE + | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER; - bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[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 ); +#ifndef NO_THREADS + bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect ); +#endif #ifdef BDB_SUBDIRS { @@ -166,7 +228,7 @@ bdb_db_open( BackendDB *be ) rc = bdb->bi_dbenv->open( bdb->bi_dbenv, bdb->bi_dbenv_home, - flags | bdb->bi_dbenv_xflags, + flags, bdb->bi_dbenv_mode ); if( rc != 0 ) { Debug( LDAP_DEBUG_ANY, @@ -175,13 +237,24 @@ bdb_db_open( BackendDB *be ) return rc; } - flags = DB_THREAD | DB_CREATE; + 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; + } + } + + flags = DB_THREAD | DB_CREATE | bdb->bi_db_opflags; bdb->bi_databases = (struct bdb_db_info **) ch_malloc( BDB_INDICES * sizeof(struct bdb_db_info *) ); /* open (and create) main database */ - for( i = 0; i < BDB_INDICES; i++ ) { + for( i = 0; bdbi_databases[i].name; i++ ) { struct bdb_db_info *db; db = (struct bdb_db_info *) ch_calloc(1, sizeof(struct bdb_db_info)); @@ -194,9 +267,28 @@ bdb_db_open( BackendDB *be ) return rc; } + if( i == BDB_ID2ENTRY ) { + rc = db->bdi_db->set_bt_compare( db->bdi_db, + bdb_bt_compare ); + rc = db->bdi_db->set_pagesize( db->bdi_db, + BDB_ID2ENTRY_PAGESIZE ); + } else { +#ifdef BDB_HIER + rc = db->bdi_db->set_bt_compare( db->bdi_db, + bdb_bt_compare ); +#elif defined(BDB_IDL_MULTI) + rc = db->bdi_db->set_flags( db->bdi_db, + DB_DUP | DB_DUPSORT ); + rc = db->bdi_db->set_dup_compare( db->bdi_db, + bdb_bt_compare ); +#endif + rc = db->bdi_db->set_pagesize( db->bdi_db, + BDB_PAGESIZE ); + } + rc = db->bdi_db->open( db->bdi_db, bdbi_databases[i].file, - bdbi_databases[i].name, + /* bdbi_databases[i].name, */ NULL, bdbi_databases[i].type, bdbi_databases[i].flags | flags, bdb->bi_dbenv_mode ); @@ -208,9 +300,13 @@ bdb_db_open( BackendDB *be ) return rc; } + db->bdi_name = bdbi_databases[i].name; bdb->bi_databases[i] = db; } + bdb->bi_databases[i] = NULL; + bdb->bi_ndatabases = i; + /* get nextid */ rc = bdb_last_id( be, NULL ); if( rc != 0 ) { @@ -220,11 +316,12 @@ bdb_db_open( BackendDB *be ) return rc; } - /* open (and create) index databases */ +#ifdef BDB_HIER + rc = bdb_build_tree( be ); +#endif - -#ifndef NO_THREADS +#if 0 /* ifndef NO_THREADS */ if( bdb->bi_lock_detect != DB_LOCK_NORUN ) { /* listener as a separate THREAD */ rc = ldap_pvt_thread_create( &bdb->bi_lock_detect_tid, @@ -239,20 +336,20 @@ bdb_db_close( BackendDB *be ) { int rc; struct bdb_info *bdb = (struct bdb_info *) be->be_private; - - /* force a checkpoint */ - 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 ); - return rc; - } + struct bdb_db_info *db; while( bdb->bi_ndatabases-- ) { - rc = bdb->bi_databases[bdb->bi_ndatabases]->bdi_db->close( - bdb->bi_databases[bdb->bi_ndatabases]->bdi_db, 0 ); + 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 ); } + free( bdb->bi_databases ); + bdb_attr_index_destroy( bdb->bi_attrs ); + + bdb_cache_release_all (&bdb->bi_cache); return 0; } @@ -265,6 +362,16 @@ bdb_db_destroy( BackendDB *be ) /* close db environment */ if( bdb->bi_dbenv ) { + /* force a checkpoint */ + 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_cache_release_all (&bdb->bi_cache); + rc = bdb->bi_dbenv->close( bdb->bi_dbenv, 0 ); bdb->bi_dbenv = NULL; if( rc != 0 ) { @@ -298,9 +405,17 @@ bdb_initialize( { static char *controls[] = { LDAP_CONTROL_MANAGEDSAIT, + LDAP_CONTROL_SUBENTRIES, + LDAP_CONTROL_NOOP, NULL }; + bi->bi_controls = controls; + + /* initialize the underlying database system */ + Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n", + 0, 0, 0 ); + { /* version check */ int major, minor, patch; char *version = db_version( &major, &minor, &patch ); @@ -310,12 +425,12 @@ bdb_initialize( patch < DB_VERSION_PATCH ) { Debug( LDAP_DEBUG_ANY, - "bi_back_initialize: version mismatch\n" + "bdb_open: version mismatch\n" "\texpected: " DB_VERSION_STRING "\n" "\tgot: %s \n", version, 0, 0 ); } - Debug( LDAP_DEBUG_ANY, "bdb_initialize: %s\n", + Debug( LDAP_DEBUG_ANY, "bdb_open: %s\n", version, 0, 0 ); } @@ -324,9 +439,15 @@ bdb_initialize( db_env_set_func_realloc( ch_realloc ); db_env_set_func_free( ch_free ); #endif + db_env_set_func_yield( ldap_pvt_thread_yield ); - bi->bi_controls = controls; + { + static char uuidbuf[40]; + + bdb_uuid.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf )); + bdb_uuid.bv_val = uuidbuf; + } bi->bi_open = 0; bi->bi_close = 0; @@ -347,18 +468,25 @@ bdb_initialize( bi->bi_op_modrdn = bdb_modrdn; bi->bi_op_search = bdb_search; -#if 0 - bi->bi_op_unbind = bdb_unbind; - bi->bi_op_abandon = bdb_abandon; + bi->bi_op_unbind = 0; + bi->bi_op_abandon = 0; bi->bi_extended = bdb_extended; +#if 0 + /* + * these routines (and their callers) are not yet designed + * to work with transaction. Using them may cause deadlock. + */ bi->bi_acl_group = bdb_group; bi->bi_acl_attribute = bdb_attribute; +#else + bi->bi_acl_group = 0; + bi->bi_acl_attribute = 0; #endif - bi->bi_chk_referrals = bdb_referrals; - bi->bi_entry_release_rw = 0; + bi->bi_chk_referrals = bdb_referrals; + bi->bi_entry_release_rw = bdb_entry_release; /* * hooks for slap tools @@ -369,7 +497,7 @@ bdb_initialize( 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 = 0; + bi->bi_tool_entry_reindex = bdb_tool_entry_reindex; bi->bi_tool_sync = 0; bi->bi_connection_init = 0;