From ea629fa971db08f2267b50522360563a8fec7f86 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 27 May 2010 15:28:09 +0000
Subject: [PATCH] Fix for issues #3395 and #3998. The changes improves the replica initialization protocol, especially flow control and handling connection outage.

---
 opendj-sdk/opends/src/messages/messages/replication.properties |   58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/opendj-sdk/opends/src/messages/messages/replication.properties b/opendj-sdk/opends/src/messages/messages/replication.properties
index 49b96c5..c9177c2 100644
--- a/opendj-sdk/opends/src/messages/messages/replication.properties
+++ b/opendj-sdk/opends/src/messages/messages/replication.properties
@@ -142,9 +142,12 @@
  (or never purge)
 SEVERE_ERR_SIMULTANEOUS_IMPORT_EXPORT_REJECTED_44=The current request is \
  rejected due to an import or an export already in progress for the same data
-SEVERE_ERR_INVALID_IMPORT_SOURCE_45=Invalid source for the import
+SEVERE_ERR_INVALID_IMPORT_SOURCE_45=On domain %s, initialization of server \
+ with serverId:%s has been requested from a server with an invalid \
+ serverId:%s. %s
 SEVERE_ERR_INVALID_EXPORT_TARGET_46=Invalid target for the export
-SEVERE_ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN_47=No reachable peer in the domain
+SEVERE_ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN_47=Domain %s: the server with \
+ serverId=%s is unreachable
 SEVERE_ERR_NO_MATCHING_DOMAIN_48=No domain matches the provided base DN '%s'
 SEVERE_ERR_MULTIPLE_MATCHING_DOMAIN_49=Multiple domains match the base DN \
  provided
@@ -277,9 +280,12 @@
  from the server with server ID %s too late and are ignored
 NOTICE_SERVER_STATE_RECOVERY_117=ServerState recovery for domain %s, \
 updated with changeNumber %s
-SEVERE_ERR_RESET_GENERATION_CONN_ERR_ID_118=The generation ID could not be \
-reset for domain %s because it is NOT connected to the replication. You should \
-check in the configuration that the domain is enabled
+SEVERE_ERR_RESET_GENERATION_CONN_ERR_ID_118=For replicated domain %s, in \
+server with serverId=%s, the generation ID could not be set to value %s \
+in the rest of the topology because this server is NOT connected to \
+any replication server. You should \
+check in the configuration that the domain is enabled and that there is one \
+replication server up and running
 SEVERE_ERR_EXCEPTION_STARTING_SESSION_PHASE_119=Caught Exception during initial \
  communication (phase %s) on domain %s with replication server %s : %s
 NOTICE_NEW_SERVER_WITH_SAME_GROUP_ID_120=Disconnecting from replication server \
@@ -335,13 +341,13 @@
  directory server %s
 NOTICE_FULL_UPDATE_ENGAGED_FROM_REMOTE_END_142=Local directory server %s has \
  finished online full update for importing suffix %s data from remote \
- directory server %s
+ directory server %s. %s
 NOTICE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START_143=Local directory server %s is \
- starting online full update for exporting suffix %s data to remote directory \
- server %s
+ starting online full update for exporting %s entries from suffix %s \
+ to remote directory server %s
 NOTICE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END_144=Local directory server %s has \
  finished online full update for exporting suffix data %s to remote directory \
- server %s
+ server %s. %s
 NOTICE_TIMEOUT_WHEN_CROSS_CONNECTION_145=Timed out trying to acquire the domain \
 lock for %s. Connection attempt from replication server %s to local replication \
 server %s will be aborted. Simultanate cross connection attempt ?
@@ -450,4 +456,36 @@
 SEVERE_ERR_INVALID_COOKIE_SYNTAX_187=Invalid syntax of the provided cookie
 NOTICE_NEW_BEST_REPLICATION_SERVER_188=Domain %s (server id: %s) : \
  disconnecting from this replication server (server id: %s, url: %s) : as a \
- new one is more suitable
+ new one %s is more suitable
+MILD_ERR_INIT_EXPORTER_DISCONNECTION_189=Domain %s (server id: %s) : \
+ remote exporter server disconnection (server id: %s ) detected during \
+ initialization
+SEVERE_ERR_INIT_IMPORT_FAILURE_190=\
+ During initialization from a remote server, the following error occurred : %s
+SEVERE_ERR_INIT_RS_DISCONNECTION_DURING_IMPORT_191=\
+ Connection failure with Replication Server %s during import
+SEVERE_ERR_INIT_BAD_MSG_ID_SEQ_DURING_IMPORT_192=\
+ Bad msg id sequence during import. Expected:%s Actual:%s
+SEVERE_ERR_INIT_NO_SUCCESS_START_FROM_SERVERS_193=\
+ The following servers did not acknowledged initialization in the expected \
+ time. They are potentially down or too slow. Servers list: %s
+SEVERE_ERR_INIT_NO_SUCCESS_END_FROM_SERVERS_194=\
+ The following servers did not end initialization being connected with the \
+ right generation (%s). They are potentially stopped or too slow. \
+ Servers list: %s
+SEVERE_ERR_INIT_RS_DISCONNECTION_DURING_EXPORT_195=\
+ When initializing remote server(s), connection to Replication Server with \
+ serverId=%s is lost
+SEVERE_ERR_INIT_HEARTBEAT_LOST_DURING_EXPORT_196=\
+ When initializing remote server(s), the initialized server with serverId=%s \
+ is potentially stopped or too slow
+SEVERE_ERR_SENDING_NEW_ATTEMPT_INIT_REQUEST_197=\
+ When sending a new initialization request for an initialization from a remote \
+ server, the following error occured %s. The initial error was : %s
+NOTICE_RESENDING_INIT_FROM_REMOTE_REQUEST_198=\
+ Resending a new initialization request for an initialization from a remote \
+ server due to the root error : %s
+NOTICE_RESENDING_INIT_TARGET_199=\
+ Resending a new initialization start for an initialization of a remote server \
+ due to the root error : %s
+ 
\ No newline at end of file

--
Gitblit v1.10.0