Hello community, here is the log from the commit of package openldap2 checked in at Fri Nov 28 16:29:48 CET 2008. -------- --- openldap2/openldap2.changes 2008-11-21 16:40:02.000000000 +0100 +++ openldap2/openldap2.changes 2008-11-28 15:47:06.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Nov 28 14:08:16 CET 2008 - rhafer@suse.de + +- Disable the slapadd trickle-task it cause performance issues + when using libdb-4.5 (bnc#449641) +- removed obsolete configure option (ldbm backend does not exist + in OpenLDAP 2.4) + +------------------------------------------------------------------- openldap2-client.changes: same change calling whatdependson for head-i586 New: ---- slapadd-no-trickle.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.F25493/_old 2008-11-28 16:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.F25493/_new 2008-11-28 16:29:05.000000000 +0100 @@ -27,7 +27,7 @@ BuildRequires: -db-devel -pwdutils libdb-4_5-devel %endif Version: 2.4.12 -Release: 4 +Release: 5 Url: http://www.openldap.org License: BSD 3-Clause %if "%{name}" == "openldap2" @@ -67,6 +67,7 @@ Patch17: slapo-chain-dangling-its5742.dif Patch18: slapd-db-close-error-its5745.dif Patch19: slapo-syncprov-skip-its5709.dif +Patch20: slapadd-no-trickle.dif Patch100: openldap-2.3.37.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -175,6 +176,7 @@ %patch17 %patch18 %patch19 +%patch20 -p1 cp %{SOURCE5} . cd ../openldap-2.3.37 %patch100 @@ -205,7 +207,6 @@ --enable-aci \ --enable-bdb \ --enable-hdb \ - --enable-ldbm \ --enable-rewrite \ --enable-ldap=yes \ --enable-meta=mod \ @@ -537,6 +538,11 @@ %endif %changelog +* Fri Nov 28 2008 rhafer@suse.de +- Disable the slapadd trickle-task it cause performance issues + when using libdb-4.5 (bnc#449641) +- removed obsolete configure option (ldbm backend does not exist + in OpenLDAP 2.4) * Fri Nov 21 2008 ro@suse.de - update check-build.sh * Wed Nov 05 2008 rhafer@suse.de ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.F25493/_old 2008-11-28 16:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.F25493/_new 2008-11-28 16:29:05.000000000 +0100 @@ -27,7 +27,7 @@ BuildRequires: -db-devel -pwdutils libdb-4_5-devel %endif Version: 2.4.12 -Release: 4 +Release: 5 Url: http://www.openldap.org License: BSD 3-Clause; openldap 2.8 %if "%{name}" == "openldap2" @@ -67,6 +67,7 @@ Patch17: slapo-chain-dangling-its5742.dif Patch18: slapd-db-close-error-its5745.dif Patch19: slapo-syncprov-skip-its5709.dif +Patch20: slapadd-no-trickle.dif Patch100: openldap-2.3.37.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -178,6 +179,7 @@ %patch17 %patch18 %patch19 +%patch20 -p1 cp %{SOURCE5} . cd ../openldap-2.3.37 %patch100 @@ -208,7 +210,6 @@ --enable-aci \ --enable-bdb \ --enable-hdb \ - --enable-ldbm \ --enable-rewrite \ --enable-ldap=yes \ --enable-meta=mod \ @@ -540,6 +541,11 @@ %endif %changelog +* Fri Nov 28 2008 rhafer@suse.de +- Disable the slapadd trickle-task it cause performance issues + when using libdb-4.5 (bnc#449641) +- removed obsolete configure option (ldbm backend does not exist + in OpenLDAP 2.4) * Fri Nov 21 2008 ro@suse.de - update check-build.sh * Wed Nov 05 2008 rhafer@suse.de ++++++ slapadd-no-trickle.dif ++++++ Index: openldap-2.4.12/servers/slapd/back-bdb/tools.c =================================================================== --- openldap-2.4.12.orig/servers/slapd/back-bdb/tools.c +++ openldap-2.4.12/servers/slapd/back-bdb/tools.c @@ -75,11 +75,7 @@ static ldap_pvt_thread_mutex_t bdb_tool_ static ldap_pvt_thread_cond_t bdb_tool_index_cond_main; static ldap_pvt_thread_cond_t bdb_tool_index_cond_work; -static ldap_pvt_thread_mutex_t bdb_tool_trickle_mutex; -static ldap_pvt_thread_cond_t bdb_tool_trickle_cond; - static void * bdb_tool_index_task( void *ctx, void *ptr ); -static void * bdb_tool_trickle_task( void *ctx, void *ptr ); int bdb_tool_entry_open( BackendDB *be, int mode ) @@ -106,10 +102,6 @@ int bdb_tool_entry_open( /* Set up for threaded slapindex */ if (( slapMode & (SLAP_TOOL_QUICK|SLAP_TOOL_READONLY)) == SLAP_TOOL_QUICK ) { if ( !bdb_tool_info ) { - ldap_pvt_thread_mutex_init( &bdb_tool_trickle_mutex ); - ldap_pvt_thread_cond_init( &bdb_tool_trickle_cond ); - ldap_pvt_thread_pool_submit( &connection_pool, bdb_tool_trickle_task, bdb->bi_dbenv ); - ldap_pvt_thread_mutex_init( &bdb_tool_index_mutex ); ldap_pvt_thread_cond_init( &bdb_tool_index_cond_main ); ldap_pvt_thread_cond_init( &bdb_tool_index_cond_work ); @@ -137,9 +129,6 @@ int bdb_tool_entry_close( { if ( bdb_tool_info ) { slapd_shutdown = 1; - ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex ); - ldap_pvt_thread_cond_signal( &bdb_tool_trickle_cond ); - ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex ); ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex ); bdb_tool_index_tcount = slap_tool_thread_max - 1; ldap_pvt_thread_cond_broadcast( &bdb_tool_index_cond_work ); @@ -522,12 +511,6 @@ ID bdb_tool_entry_put( goto done; } - if (( slapMode & SLAP_TOOL_QUICK ) && (( e->e_id & 0xfff ) == 0xfff )) { - ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex ); - ldap_pvt_thread_cond_signal( &bdb_tool_trickle_cond ); - ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex ); - } - if ( !bdb->bi_linear_index ) rc = bdb_tool_index_add( &op, tid, e ); if( rc != 0 ) { @@ -1100,25 +1083,6 @@ int bdb_tool_idl_add( #endif static void * -bdb_tool_trickle_task( void *ctx, void *ptr ) -{ - DB_ENV *env = ptr; - int wrote; - - ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex ); - while ( 1 ) { - ldap_pvt_thread_cond_wait( &bdb_tool_trickle_cond, - &bdb_tool_trickle_mutex ); - if ( slapd_shutdown ) - break; - env->memp_trickle( env, 30, &wrote ); - } - ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex ); - - return NULL; -} - -static void * bdb_tool_index_task( void *ctx, void *ptr ) { int base = *(int *)ptr; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de