From b5acb25ee2ad9bf8b166b9de1a34e6aab6ea23b7 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Fri, 01 Sep 2006 12:04:47 +0000
Subject: [PATCH] issue 604 : solve the naming conflict that might happen when several masters are used there are 3 main parts in this commit : - attach the replication context in an OperationContext - if operation replay fails then fix the problem - in the pre-op checks for conflict and cause failure if necessary most of the time there should be no conflict and the operation should be processed normally
---
opends/src/server/org/opends/server/synchronization/SynchMessages.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/synchronization/SynchMessages.java b/opends/src/server/org/opends/server/synchronization/SynchMessages.java
index 194b6d5..1c3a9aa 100644
--- a/opends/src/server/org/opends/server/synchronization/SynchMessages.java
+++ b/opends/src/server/org/opends/server/synchronization/SynchMessages.java
@@ -36,15 +36,10 @@
public class SynchMessages {
/**
- * name of Synchronization.
- */
- public static final String SYNCHRONIZATION = "synchronization";
-
- /**
* Name used to store attachment of historical information in the
* operation.
*/
- public static final String HISTORICAL = "historical";
+ public static final String HISTORICAL = "ds-synch-historical";
/**
* Invalid DN.
@@ -256,6 +251,12 @@
CATEGORY_MASK_SYNC | SEVERITY_MASK_SEVERE_ERROR | 33;
/**
+ * Exception while receiving a message.
+ */
+ public static final int MSGID_EXCEPTION_RECEIVING_SYNCHRONIZATION_MESSAGE =
+ CATEGORY_MASK_SYNC | SEVERITY_MASK_SEVERE_ERROR | 34;
+
+ /**
* Register the messages from this class in the core server.
*
*/
@@ -288,7 +289,7 @@
"Changelog failed to start " +
"because the database %s could not be read");
MessageHandler.registerMessage(MSGID_EXCEPTION_REPLAYING_OPERATION,
- "Caught Exception %s when replaying operation %s : %s");
+ "An Exception was caught while replaying operation %s : %s");
MessageHandler.registerMessage(MSGID_NEED_CHANGELOG_PORT,
"The Changelog server port must be defined");
MessageHandler.registerMessage(MSGID_ERROR_UPDATING_RUV,
@@ -341,5 +342,8 @@
MessageHandler.registerMessage(MSGID_CHANGELOG_ERROR_SENDING_ACK,
"An unexpected error happened sending an ack to %s." +
"This connection is going to be closed. ");
+ MessageHandler.registerMessage(
+ MSGID_EXCEPTION_RECEIVING_SYNCHRONIZATION_MESSAGE,
+ "An Exception was caught while receiving synchronization message : %s");
}
}
--
Gitblit v1.10.0