From dc0f90d36de816f65220753686b5e2499c6b1f86 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 21 Jan 2002 08:19:28 +0000 Subject: [PATCH] Set lock detector to DEFAULT, not NORUN. Clean up some error handling --- servers/slapd/back-bdb/init.c | 5 ++++- servers/slapd/backend.c | 13 +++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index 6f56376262..cecf9d6ddb 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -79,7 +79,11 @@ bdb_db_init( BackendDB *be ) bdb->bi_txn = 1; /* default to using transactions */ #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 ); @@ -356,7 +360,6 @@ bdb_db_destroy( BackendDB *be ) /* close db environment */ if( bdb->bi_dbenv ) { - /* force a checkpoint */ if( bdb->bi_txn ) { rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE ); diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index 7ddf2f9640..1fa476c6cf 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -272,11 +272,11 @@ int backend_startup(Backend *be) if(rc != 0) { #ifdef NEW_LOGGING LDAP_LOG(( "backend", LDAP_LEVEL_CRIT, - "backend_startup: bi_db_open failed!\n" )); + "backend_startup: bi_db_open failed! (%d)\n", rc )); #else Debug( LDAP_DEBUG_ANY, - "backend_startup: bi_db_open failed!\n", - 0, 0, 0 ); + "backend_startup: bi_db_open failed! (%d)\n", + rc, 0, 0 ); #endif return rc; } @@ -322,11 +322,12 @@ int backend_startup(Backend *be) if(rc != 0) { #ifdef NEW_LOGGING LDAP_LOG(( "backend", LDAP_LEVEL_CRIT, - "backend_startup: bi_db_open %d failed!\n", i )); + "backend_startup: bi_db_open(%d) failed! (%d)\n", + i, rc )); #else Debug( LDAP_DEBUG_ANY, - "backend_startup: bi_db_open %d failed!\n", - i, 0, 0 ); + "backend_startup: bi_db_open(%d) failed! (%d)\n", + i, rc, 0 ); #endif return rc; } -- 2.39.5