From 4d0faf5b8ad46e978a72d35a8f736f83fb61fd2d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 30 Mar 2011 19:21:16 +0000
Subject: [PATCH] Fix issue OpenDJ-96: Replication server monitor data computation takes too long / blocks rest of server when another RS is cannot be reached

---
 opends/src/messages/messages/replication.properties |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/opends/src/messages/messages/replication.properties b/opends/src/messages/messages/replication.properties
index 38f310e..b595c43 100644
--- a/opends/src/messages/messages/replication.properties
+++ b/opends/src/messages/messages/replication.properties
@@ -21,6 +21,7 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2010 Sun Microsystems, Inc.
+#      Portions copyright 2011 ForgeRock AS
 #
 #
 # This file contains the primary Directory Server configuration.  It must not
@@ -257,13 +258,13 @@
   export-ldif command must be run as a task
 NOTICE_SSL_SERVER_CON_ATTEMPT_ERROR_105=SSL connection attempt from %s (%s) \
   failed: %s
-SEVERE_ERR_MISSING_REMOTE_MONITOR_DATA_106=Monitor data of remote servers \
- are missing due to an error in the retrieval process. Potentially a server \
- is too slow to provide its monitoring data over the protocol
+SEVERE_ERR_MISSING_REMOTE_MONITOR_DATA_106=Timed out waiting for monitor data \
+ for the domain "%s" from replication server RS(%d)
 SEVERE_ERR_PROCESSING_REMOTE_MONITOR_DATA_107=Monitor data of remote servers \
  are missing due to a processing error : %s
-SEVERE_ERR_SENDING_REMOTE_MONITOR_DATA_REQUEST_108=Exception raised when \
- sending request to get remote monitor data
+SEVERE_ERR_SENDING_REMOTE_MONITOR_DATA_REQUEST_108=Unable to send monitor data \
+ request for domain "%s" to replication server RS(%d) due to the following \
+ error: %s
 SEVERE_ERR_EXCEPTION_REPLAYING_REPLICATION_MESSAGE_109=An Exception was caught \
  while replaying replication message : %s
 SEVERE_ERR_REPLICATION_SERVER_CONFIG_NOT_FOUND_110=The replication server \
@@ -276,8 +277,8 @@
 for domain %s : %s
 SEVERE_ERR_COMPUTING_FAKE_OPS_115=Caught exception computing fake operations \
 for domain %s for replication server %s : %s
-NOTICE_IGNORING_REMOTE_MONITOR_DATA_116=Some monitor data have been received \
- from the server with server ID %s too late and are ignored
+INFO_IGNORING_REMOTE_MONITOR_DATA_116=Late monitor data received for domain "%s" \
+ from replication server RS(%d), and will be ignored
 NOTICE_SERVER_STATE_RECOVERY_117=ServerState recovery for domain %s, \
 updated with changeNumber %s
 SEVERE_ERR_RESET_GENERATION_CONN_ERR_ID_118=For replicated domain %s, in \
@@ -497,3 +498,5 @@
  changes with same changeNumber=%s. Previous msg=<%s>, New msg=<%s>
 SEVERE_ERR_COULD_NOT_SOLVE_CONFLICT_202=Error while trying to solve conflict \
  with DN : %s ERROR : %s
+NOTICE_MONITOR_DATA_RECEIVED_203=Monitor data for the domain "%s" has been \
+ received from replication server RS(%d)

--
Gitblit v1.10.0