From fc1aa420ce7640cd874e6700188c7b7a133ccd4d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 13 Aug 2013 15:15:13 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 38 +++++++++-----------------------------
1 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 379dfe4..d02fe4a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -53,6 +53,9 @@
import org.opends.server.replication.plugin.MultimasterReplication;
import org.opends.server.replication.protocol.*;
import org.opends.server.replication.server.changelog.api.ChangelogException;
+import org.opends.server.replication.server.changelog.je.DbHandler;
+import org.opends.server.replication.server.changelog.je.DraftCNDbHandler;
+import org.opends.server.replication.server.changelog.je.ReplicationDbEnv;
import org.opends.server.types.*;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.ServerConstants;
@@ -484,8 +487,8 @@
boolean sslEncryption =replSessionSecurity.isSslEncryption(remoteServerURL);
if (debugEnabled())
- TRACER.debugInfo("RS " + this.getMonitorInstanceName() +
- " connects to " + remoteServerURL);
+ TRACER.debugInfo("RS " + getMonitorInstanceName() + " connects to "
+ + remoteServerURL);
Socket socket = new Socket();
Session session = null;
@@ -937,7 +940,7 @@
* @return The time after which changes must be deleted from the
* persistent storage (in milliseconds).
*/
- long getTrimAge()
+ public long getTrimAge()
{
return purgeDelay * 1000;
}
@@ -1190,8 +1193,7 @@
*/
public long getGenerationId(String baseDN)
{
- ReplicationServerDomain rsd =
- this.getReplicationServerDomain(baseDN, false);
+ ReplicationServerDomain rsd = getReplicationServerDomain(baseDN, false);
if (rsd!=null)
return rsd.getGenerationId();
return -1;
@@ -1682,8 +1684,7 @@
* @throws DirectoryException
* when needed.
*/
- public DraftCNDbHandler getDraftCNDbHandler()
- throws DirectoryException
+ public DraftCNDbHandler getDraftCNDbHandler() throws DirectoryException
{
synchronized (draftCNLock)
{
@@ -1786,7 +1787,7 @@
int lastDraftCN;
Boolean dbEmpty = false;
Long newestDate = 0L;
- DraftCNDbHandler draftCNDbH = this.getDraftCNDbHandler();
+ DraftCNDbHandler draftCNDbH = getDraftCNDbHandler();
// Get the first DraftCN from the DraftCNdb
int firstDraftCN = draftCNDbH.getFirstKey();
@@ -1923,27 +1924,6 @@
}
}
-
-
- /**
- * Shuts down replication when an unexpected database exception occurs. Note
- * that we do not expect lock timeouts or txn timeouts because the replication
- * databases are deadlock free, thus all operations should complete
- * eventually.
- *
- * @param e
- * The unexpected database exception.
- */
- void handleUnexpectedChangelogException(ChangelogException e)
- {
- MessageBuilder mb = new MessageBuilder();
- mb.append(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR.get());
- mb.append(". ");
- mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
- shutdown();
- }
-
/**
* Get the replication server DB directory.
* This is useful for tests to be able to do some cleanup. Might even be
--
Gitblit v1.10.0