summaryrefslogtreecommitdiffstats
path: root/ldap
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2010-10-20 18:30:10 -0700
committerNoriko Hosoi <nhosoi@redhat.com>2010-10-20 18:30:10 -0700
commitb065fb3e3fa6ded5569b01bc9ed7a2fda532883d (patch)
treeea03375e1d877395c8ec86e8524e06b9c62b6b06 /ldap
parent904698eaf466a865c0edb9a0743469f23c97bab8 (diff)
downloadds-b065fb3e3fa6ded5569b01bc9ed7a2fda532883d.tar.gz
ds-b065fb3e3fa6ded5569b01bc9ed7a2fda532883d.tar.xz
ds-b065fb3e3fa6ded5569b01bc9ed7a2fda532883d.zip
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.
Diffstat (limited to 'ldap')
-rw-r--r--ldap/servers/plugins/retrocl/retrocl.h2
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_trim.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/ldap/servers/plugins/retrocl/retrocl.h b/ldap/servers/plugins/retrocl/retrocl.h
index c4354d47..276912bb 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 7e977369..756f13b0 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);
}