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;
if ( be->be_suffix == NULL ) {
Debug( LDAP_DEBUG_ANY,
- LDAP_XSTRING(bdb_db_open) ": need suffix\n",
+ LDAP_XSTRING(bdb_db_open) ": need suffix.\n",
1, 0, 0 );
return -1;
}
Debug( LDAP_DEBUG_ARGS,
- LDAP_XSTRING(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 ) {
if (cr) {
- snprintf(cr->msg, sizeof(cr->msg), "only one suffix allowed");
+ snprintf(cr->msg, sizeof(cr->msg),
+ "database \"%s\": only one suffix allowed.",
+ be->be_suffix[0].bv_val);
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": %s\n", cr->msg, 0, 0 );
}
/* 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,
- LDAP_XSTRING(bdb_db_open) ": Cannot access database directory %s (%d)\n",
- bdb->bi_dbenv_home, errno, 0 );
+ 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;
}
if( rc == ALOCK_RECOVER ) {
Debug( LDAP_DEBUG_ANY,
- LDAP_XSTRING(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,
- LDAP_XSTRING(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,
- LDAP_XSTRING(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( 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"
- "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;
}
}
}
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",
+ 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 );
}
*/
if ( do_recover && ( slapMode & SLAP_TOOL_READONLY )) {
Debug( LDAP_DEBUG_ANY,
- LDAP_XSTRING(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;
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 );
+ 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;
}
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 );
+ 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;
}
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 );
+ 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,
- LDAP_XSTRING(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;
}
}
bdb->bi_dbenv_xflags, 1);
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- LDAP_XSTRING(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;
}
}
#define BDB_TXN_FLAGS (DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN)
Debug( LDAP_DEBUG_TRACE,
- LDAP_XSTRING(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;
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 faied, probably a missing shm environment.
+ /* Regular open failed, probably a missing shm environment.
* Start over, do a recovery.
*/
if ( !do_recover && bdb->bi_shm_key ) {
rc = db_env_create( &bdb->bi_dbenv, 0 );
if( rc == 0 ) {
Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_db_open)
- ": Shared memory env open failed, assuming stale env\n",
- 0, 0, 0 );
+ ": 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 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,
- LDAP_XSTRING(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;
}
}
#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;
rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- LDAP_XSTRING(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;
}
#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,
- LDAP_XSTRING(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;
}
/* 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,
- LDAP_XSTRING(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 ) {
+#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
}
entry_prealloc( bdb->bi_cache.c_maxsize );
if( bdb->bi_dbenv ) {
/* 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
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 );
}
}
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;
}
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;
projects / openldap / blobdiff