From 891159050af4aa3fe47c67e3ba7d3f21299027a4 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Dec 2013 14:01:32 +0000
Subject: [PATCH] OPENDJ-1174 (CR-2631) Transfer responsibility for populating the ChangeNumberIndexDB to ChangelogDB
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
index 241a084..ad79c9a 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
@@ -295,6 +295,30 @@
replicationServer.shutdown();
break;
}
+ try {
+ trim(shutdown);
+
+ synchronized (this)
+ {
+ try
+ {
+ wait(1000);
+ } catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ }
+ }
+ } catch (Exception end)
+ {
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH.get());
+ mb.append(" ");
+ mb.append(stackTraceToSingleLineString(end));
+ logError(mb.toMessage());
+ if (replicationServer != null)
+ replicationServer.shutdown();
+ break;
+ }
}
synchronized (this)
@@ -306,9 +330,13 @@
/**
* Trim old changes from this database.
- * @throws ChangelogException In case of database problem.
+ *
+ * @param shutdown
+ * AtomicBoolean telling whether the current run must be stopped
+ * @throws ChangelogException
+ * In case of database problem.
*/
- private void trim(AtomicBoolean shutdown) throws ChangelogException
+ public void trim(AtomicBoolean shutdown) throws ChangelogException
{
if (trimAge == 0)
return;
--
Gitblit v1.10.0