From fccc1fc987c9c4c7c9f5abf3d7449f1cc39054fe Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 05 Jun 2013 13:15:44 +0000
Subject: [PATCH] Partial fix for OPENDJ-951: Reduce size and frequency of replication MonitorMsg

---
 opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_de.properties                     |    2 +-
 opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_ja.properties                     |    2 +-
 opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_fr.properties                     |    2 +-
 opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_zh_CN.properties                  |    2 +-
 opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_es.properties                     |    2 +-
 opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml |    9 ++++++---
 opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn.properties                        |    2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
index c2ca16b..7474603 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
@@ -305,13 +305,16 @@
       The period between sending of monitoring messages.
     </adm:synopsis>
     <adm:description>
-      Defines the number of milliseconds that the replication server will wait
+      Defines the duration that the replication server will wait
       before sending new monitoring messages to its peers (replication servers
-      and directory servers).
+      and directory servers). Larger values increase the length of time it
+      takes for a directory server to detect and switch to a more suitable
+      replication server, whereas smaller values increase the amount of
+      background network traffic.  
     </adm:description>
     <adm:default-behavior>
       <adm:defined>
-        <adm:value>3000ms</adm:value>
+        <adm:value>60s</adm:value>
       </adm:defined>
     </adm:default-behavior>
     <adm:syntax>
diff --git a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn.properties b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn.properties
index de7b9de..2da666d 100644
--- a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn.properties
+++ b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn.properties
@@ -8,7 +8,7 @@
 property.group-id.synopsis=The group id for the replication server.
 property.group-id.description=This value defines the group id of the replication server. The replication system of a LDAP server uses the group id of the replicated domain and tries to connect, if possible, to a replication with the same group id.
 property.monitoring-period.synopsis=The period between sending of monitoring messages.
-property.monitoring-period.description=Defines the number of milliseconds that the replication server will wait before sending new monitoring messages to its peers (replication servers and directory servers).
+property.monitoring-period.description=Defines the duration that the replication server will wait before sending new monitoring messages to its peers (replication servers and directory servers). Larger values increase the length of time it takes for a directory server to detect and switch to a more suitable replication server, whereas smaller values increase the amount of background network traffic.
 property.queue-size.synopsis=Specifies the number of changes that are kept in memory for each directory server in the Replication Domain.
 property.replication-db-directory.synopsis=The path where the Replication Server stores all persistent information.
 property.replication-port.synopsis=The port on which this Replication Server waits for connections from other Replication Servers or Directory Servers.
diff --git a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_de.properties b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_de.properties
index 7e3dc13..a7fd6fd 100644
--- a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_de.properties
+++ b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_de.properties
@@ -8,7 +8,7 @@
 property.group-id.synopsis=Die Gruppen-ID f\u00fcr den Replikationsserver.
 property.group-id.description=Der Wert definiert die Gruppen-ID des Replikationsservers. Das Replikationssystem eines LDAP-Servers verwendet die Gruppen-ID der replizierten Dom\u00e4ne und versucht, m\u00f6glichst eine Verbindung zu einer Replikation mit der gleichen Gruppen-ID herzustellen.
 property.monitoring-period.synopsis=Der Zeitraum zwischen dem Senden von \u00dcberwachungsmeldungen.
-property.monitoring-period.description=Gibt die Anzahl an Millisekunden an, die der Replikationsserver wartet, bevor neue \u00dcberwachungsmeldungen an Peers (Replikationsserver und Directory Server) gesendet werden.
+#property.monitoring-period.description=Defines the duration that the replication server will wait before sending new monitoring messages to its peers (replication servers and directory servers). Larger values increase the length of time it takes for a directory server to detect and switch to a more suitable replication server, whereas smaller values increase the amount of background network traffic.
 property.queue-size.synopsis=Gibt die Anzahl der \u00c4nderungen an, die im Speicher f\u00fcr jeden Directory-Server in der Replikationsdom\u00e4ne beibehalten werden.
 property.replication-db-directory.synopsis=Der Pfad, unter dem der Replikationsserver alle dauerhaften Informationen speichert.
 property.replication-port.synopsis=Der Anschluss, an dem der Replikationsserver auf Verbindungen von anderen Replikationsservern oder Directory-Servern wartet.
diff --git a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_es.properties b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_es.properties
index 4f89edf..f6a520c 100644
--- a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_es.properties
+++ b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_es.properties
@@ -8,7 +8,7 @@
 property.group-id.synopsis=El Id. de grupo del servidor de repetici\u00f3n.
 property.group-id.description=Este valor define el Id. de grupo del servidor de repetici\u00f3n. El sistema de repetici\u00f3n de un servidor LDAP utiliza el Id. de grupo del dominio repetido y, si es posible, intenta conectarse a una repetici\u00f3n con el mismo Id. de grupo.
 property.monitoring-period.synopsis=El per\u00edodo que transcurre entre el env\u00edo de los mensajes de supervisi\u00f3n.
-property.monitoring-period.description=Define el n\u00famero de milisegundos que el servidor de repetici\u00f3n esperar\u00e1 antes de enviar nuevos mensajes de supervisi\u00f3n a sus principales (servidores de repetici\u00f3n y servidores de directorios).
+#property.monitoring-period.description=Defines the duration that the replication server will wait before sending new monitoring messages to its peers (replication servers and directory servers). Larger values increase the length of time it takes for a directory server to detect and switch to a more suitable replication server, whereas smaller values increase the amount of background network traffic.
 property.queue-size.synopsis=Especifica el n\u00famero de cambios que se conserva en la memoria de cada instancia de Directory Server del dominio de repetici\u00f3n.
 property.replication-db-directory.synopsis=La ruta a la ubicaci\u00f3n en la que el servidor de repetici\u00f3n almacena toda la informaci\u00f3n persistente.
 property.replication-port.synopsis=El puerto en el que este servidor de repetici\u00f3n espera las conexiones de otros servidores de repetici\u00f3n o de otras instancias de Directory Server.
diff --git a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_fr.properties b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_fr.properties
index 3ea7002..3914f06 100644
--- a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_fr.properties
+++ b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_fr.properties
@@ -8,7 +8,7 @@
 property.group-id.synopsis=Id du groupe pour le serveur de r\u00e9plication.
 property.group-id.description=Cette valeur d\u00e9finit l'id du groupe du serveur de r\u00e9plication. Le syst\u00e8me de r\u00e9plication d'un serveur LDAP utilise l'id du groupe du domaine r\u00e9pliqu\u00e9 et essaie de se connecter, si possible, \u00e0 une r\u00e9plication avec le m\u00eame id de groupe.
 property.monitoring-period.synopsis=La p\u00e9riode entre l'envoi du contr\u00f4le des messages.
-property.monitoring-period.description=D\u00e9finit le nombre de millisecondes pendant lequel le serveur de r\u00e9plication patientera avant d'envoyer de nouveaux messages de contr\u00f4le \u00e0 ses pairs (serveurs de r\u00e9plication et d'annuaire).
+#property.monitoring-period.description=Defines the duration that the replication server will wait before sending new monitoring messages to its peers (replication servers and directory servers). Larger values increase the length of time it takes for a directory server to detect and switch to a more suitable replication server, whereas smaller values increase the amount of background network traffic.
 property.queue-size.synopsis=Sp\u00e9cifie le nombre de modifications gard\u00e9es en m\u00e9moire pour chaque serveur d'annuaire dans le domaine de r\u00e9plication.
 property.replication-db-directory.synopsis=Le chemin o\u00f9 le serveur de r\u00e9plication stocke toutes les informations persistantes.
 property.replication-port.synopsis=Le port sur lequel ce serveur de r\u00e9plication attend des connexions depuis d'autres serveurs de r\u00e9plication ou serveurs d'annuaire.
diff --git a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_ja.properties b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_ja.properties
index 3f9176c..828dfe4 100644
--- a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_ja.properties
+++ b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_ja.properties
@@ -8,7 +8,7 @@
 property.group-id.synopsis=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u306e\u30b0\u30eb\u30fc\u30d7 ID\u3002
 property.group-id.description=\u3053\u306e\u5024\u306f\u3001\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u306e\u30b0\u30eb\u30fc\u30d7 ID \u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002LDAP \u30b5\u30fc\u30d0\u30fc\u306e\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b7\u30b9\u30c6\u30e0\u306f\u3001\u30ec\u30d7\u30ea\u30b1\u30fc\u30c8\u3055\u308c\u305f\u30c9\u30e1\u30a4\u30f3\u306e\u30b0\u30eb\u30fc\u30d7 ID \u3092\u4f7f\u7528\u3057\u3066\u3001\u53ef\u80fd\u306a\u9650\u308a\u3001\u540c\u3058\u30b0\u30eb\u30fc\u30d7 ID \u3092\u6301\u3064\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u63a5\u7d9a\u3057\u3088\u3046\u3068\u3057\u307e\u3059\u3002
 property.monitoring-period.synopsis=\u76e3\u8996\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u9001\u4fe1\u306e\u9593\u9694\u3002
-property.monitoring-period.description=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u304c\u65b0\u3057\u3044\u76e3\u8996\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u305d\u306e\u30d4\u30a2 (\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u3084\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc) \u306b\u9001\u4fe1\u3059\u308b\u307e\u3067\u306e\u5f85\u3061\u6642\u9593\u3092\u30df\u30ea\u79d2\u5358\u4f4d\u3067\u5b9a\u7fa9\u3057\u307e\u3059\u3002
+#property.monitoring-period.description=Defines the duration that the replication server will wait before sending new monitoring messages to its peers (replication servers and directory servers). Larger values increase the length of time it takes for a directory server to detect and switch to a more suitable replication server, whereas smaller values increase the amount of background network traffic.
 property.queue-size.synopsis=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30c9\u30e1\u30a4\u30f3\u5185\u306e\u5404\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306e\u30e1\u30e2\u30ea\u30fc\u306b\u4fdd\u6301\u3055\u308c\u308b\u5909\u66f4\u306e\u6570\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
 property.replication-db-directory.synopsis=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u304c\u3059\u3079\u3066\u306e\u6301\u7d9a\u7684\u306a\u60c5\u5831\u3092\u683c\u7d0d\u3059\u308b\u5834\u6240\u306e\u30d1\u30b9\u3002
 property.replication-port.synopsis=\u3053\u306e\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u304c\u3001\u307b\u304b\u306e\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u307e\u305f\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u63a5\u7d9a\u3092\u5f85\u6a5f\u3059\u308b\u30dd\u30fc\u30c8\u3002
diff --git a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_zh_CN.properties b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_zh_CN.properties
index 18f2221..2cad2d9 100644
--- a/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_zh_CN.properties
+++ b/opendj-sdk/opends/src/admin/messages/ReplicationServerCfgDefn_zh_CN.properties
@@ -8,7 +8,7 @@
 property.group-id.synopsis=\u590d\u5236\u670d\u52a1\u5668\u7684\u7ec4 ID\u3002
 property.group-id.description=\u8be5\u503c\u5b9a\u4e49\u4e86\u590d\u5236\u670d\u52a1\u5668\u7684\u7ec4 ID\u3002LDAP \u670d\u52a1\u5668\u7684\u590d\u5236\u7cfb\u7edf\u5c06\u4f7f\u7528\u88ab\u590d\u5236\u57df\u7684\u7ec4 ID\uff0c\u5e76\u5c06\u5c1d\u8bd5\u8fdb\u884c\u8fde\u63a5\uff0c\u5982\u679c\u53ef\u80fd\uff0c\u4f1a\u5c1d\u8bd5\u8fde\u63a5\u5230\u5177\u6709\u76f8\u540c\u7ec4 ID \u7684\u590d\u5236\u670d\u52a1\u5668\u3002
 property.monitoring-period.synopsis=\u53d1\u9001\u76d1\u89c6\u6d88\u606f\u4e4b\u95f4\u7684\u671f\u9650\u3002
-property.monitoring-period.description=\u5b9a\u4e49\u590d\u5236\u670d\u52a1\u5668\u5728\u5c06\u65b0\u76d1\u89c6\u6d88\u606f\u53d1\u9001\u81f3\u5176\u5bf9\u7b49\u70b9\uff08\u590d\u5236\u670d\u52a1\u5668\u548c\u76ee\u5f55\u670d\u52a1\u5668\uff09\u4e4b\u524d\u7b49\u5f85\u7684\u6beb\u79d2\u6570\u3002
+#property.monitoring-period.description=Defines the duration that the replication server will wait before sending new monitoring messages to its peers (replication servers and directory servers). Larger values increase the length of time it takes for a directory server to detect and switch to a more suitable replication server, whereas smaller values increase the amount of background network traffic.
 property.queue-size.synopsis=\u6307\u5b9a\u4e3a\u590d\u5236\u57df\u4e2d\u7684\u6bcf\u4e2a Directory Server \u4fdd\u7559\u7684\u66f4\u6539\u6b21\u6570\u3002
 property.replication-db-directory.synopsis=\u590d\u5236\u670d\u52a1\u5668\u5b58\u50a8\u6240\u6709\u6c38\u4e45\u4fe1\u606f\u7684\u8def\u5f84\u3002
 property.replication-port.synopsis=\u8be5\u590d\u5236\u670d\u52a1\u5668\u7b49\u5f85\u6765\u81ea\u5176\u4ed6\u590d\u5236\u670d\u52a1\u5668\u6216 Directory Server \u7684\u8fde\u63a5\u7684\u7aef\u53e3\u3002

--
Gitblit v1.10.0