From 45a8024fe68e7bc451a5a22afcaf31e7edb745a1 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 12 Aug 2013 15:22:03 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 001e7de..379dfe4 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -27,12 +27,6 @@
*/
package org.opends.server.replication.server;
-import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
@@ -58,13 +52,18 @@
import org.opends.server.replication.common.*;
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.types.*;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.TimeThread;
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
-import com.sleepycat.je.DatabaseException;
+import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
/**
* ReplicationServer Listener. This singleton is the main object of the
@@ -559,15 +558,11 @@
TRACER.debugInfo("RS " +getMonitorInstanceName()+
" successfully initialized");
- } catch (DatabaseException e)
+ } catch (ChangelogException e)
{
- Message message = ERR_COULD_NOT_INITIALIZE_DB.get(
- getFileForPath(dbDirname).getAbsolutePath());
- logError(message);
- } catch (ReplicationDBException e)
- {
- Message message = ERR_COULD_NOT_READ_DB.get(dbDirname,
- e.getLocalizedMessage());
+ Message message = ERR_COULD_NOT_READ_DB.get(
+ getFileForPath(dbDirname).getAbsolutePath(),
+ e.getLocalizedMessage());
logError(message);
} catch (UnknownHostException e)
{
@@ -870,10 +865,10 @@
* @param baseDn The DN for which the dbHandler must be created.
* @return The new DB handler for this ReplicationServer and the serverId and
* DN given in parameter.
- * @throws DatabaseException in case of underlying database problem.
+ * @throws ChangelogException in case of underlying database problem.
*/
public DbHandler newDbHandler(int id, String baseDn)
- throws DatabaseException
+ throws ChangelogException
{
return new DbHandler(id, baseDn, this, dbEnv, queueSize);
}
@@ -967,6 +962,7 @@
ServerSocket tmpSocket = new ServerSocket();
tmpSocket.bind(new InetSocketAddress(port));
tmpSocket.close();
+ return true;
}
catch (Exception e)
{
@@ -974,8 +970,6 @@
unacceptableReasons.add(message);
return false;
}
-
- return true;
}
/**
@@ -1262,7 +1256,6 @@
mb.append(e.getLocalizedMessage());
Message msg = ERR_CHECK_CREATE_REPL_BACKEND_FAILED.get(mb.toString());
throw new ConfigException(msg, e);
-
}
}
@@ -1941,7 +1934,7 @@
* @param e
* The unexpected database exception.
*/
- void handleUnexpectedDatabaseException(DatabaseException e)
+ void handleUnexpectedChangelogException(ChangelogException e)
{
MessageBuilder mb = new MessageBuilder();
mb.append(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR.get());
--
Gitblit v1.10.0