From 791840ef10ecb9f25b4c3b97eacbf848bf75a261 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 24 Apr 2013 12:44:51 +0000
Subject: [PATCH] Replication Cleanup.
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
index fe5b442..2536033 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
@@ -23,9 +23,11 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.replication.server;
+
+import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
import static org.opends.server.loggers.ErrorLogger.logError;
@@ -75,7 +77,7 @@
//
// A counter record has to follow the order of the db, so it needs to have
// a changenumber key that follow the order.
- // A counter record must have its own chagenumber key since the Db does not
+ // A counter record must have its own changenumber key since the Db does not
// support duplicate key (it is a compatibility breaker character of the DB).
//
// We define 2 conditions to store a counter record :
@@ -813,9 +815,10 @@
return null;
}
+ ChangeNumber cn = null;
try
{
- ChangeNumber cn = new ChangeNumber(
+ cn = new ChangeNumber(
decodeUTF8(key.getData()));
if (ReplicationDB.isaCounter(cn))
{
@@ -833,9 +836,14 @@
* happen if the database is corrupted. There is not much more that we
* can do at this point except trying to continue with the next
* record. In such case, it is therefore possible that we miss some
- * changes. TODO. log an error message. TODO : REPAIR : Such problem
- * should be handled by the repair functionality.
+ * changes.
+ * TODO : This should be handled by the repair functionality.
*/
+ Message message = ERR_REPLICATIONDB_CANNOT_PROCESS_CHANGE_RECORD
+ .get(replicationServer.getServerId(),
+ (cn == null ? "" : cn.toString()),
+ e.getMessage());
+ logError(message);
}
}
return currentChange;
@@ -1085,7 +1093,6 @@
/**
* Encode the provided counter value in a database entry.
- * @param entry The provided entry.
* @return The database entry with the counter value encoded inside.
*/
static private DatabaseEntry encodeCounterValue(int value)
--
Gitblit v1.10.0