ldap/servers/plugins/retrocl/retrocl.h | 2 +- ldap/servers/plugins/retrocl/retrocl_trim.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)

New commits: commit b065fb3e3fa6ded5569b01bc9ed7a2fda532883d Author: Noriko Hosoi nhosoi@redhat.com Date: Wed Oct 20 18:30:10 2010 -0700

Bug 629681 - Retro Changelog trimming does not behave as expected

https://bugzilla.redhat.com/show_bug.cgi?id=629681

Description: As reporter Oliver Thalmann (oliver.thalmann@chuv.ch) pointed out, retrocl_init_trimming was repeating the retrocl_ housekeeping event every 5000 minutes instead of 5 minutes. This patch fixes it to 5 minutes.

diff --git a/ldap/servers/plugins/retrocl/retrocl.h b/ldap/servers/plugins/retrocl/retrocl.h index c4354d4..276912b 100644 --- a/ldap/servers/plugins/retrocl/retrocl.h +++ b/ldap/servers/plugins/retrocl/retrocl.h @@ -80,7 +80,7 @@ typedef struct _cnumRet { /* * How often the changelog trimming thread runs. This is the minimum trim age. */ -#define CHANGELOGDB_TRIM_INTERVAL 300*1000 /* 5 minutes */ +#define CHANGELOGDB_TRIM_INTERVAL 300*1000 /* 5 minutes in milliseconds */

#if defined(__hpux) && defined(__ia64) #define RETROCL_DLL_DEFAULT_THREAD_STACKSIZE 524288L diff --git a/ldap/servers/plugins/retrocl/retrocl_trim.c b/ldap/servers/plugins/retrocl/retrocl_trim.c index 7e97736..756f13b 100644 --- a/ldap/servers/plugins/retrocl/retrocl_trim.c +++ b/ldap/servers/plugins/retrocl/retrocl_trim.c @@ -516,8 +516,9 @@ void retrocl_init_trimming (void) retrocl_trimming = 1;

retrocl_trim_ctx = slapi_eq_repeat(retrocl_housekeeping, - NULL,(time_t)0, - CHANGELOGDB_TRIM_INTERVAL * 1000); + NULL, (time_t)0, + /* in milliseconds */ + CHANGELOGDB_TRIM_INTERVAL);

}