From 2ef6ccc34c1f8e9a33475650a9e59af1ba74177d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 21 May 2013 17:15:15 +0000
Subject: [PATCH] Fix OPENDJ-922: Replication window size is too small on high latency networks
---
opends/src/admin/messages/ReplicationServerCfgDefn.properties | 1 +
opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml | 9 ++++++---
opends/src/admin/messages/ReplicationDomainCfgDefn.properties | 1 +
opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml | 9 ++++++---
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
index 8c08015..0d5e071 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
@@ -24,7 +24,7 @@
!
!
! Copyright 2007-2010 Sun Microsystems, Inc.
- ! Portions Copyright 2011 ForgeRock AS
+ ! Portions Copyright 2011-2013 ForgeRock AS
! -->
<adm:managed-object name="replication-domain"
plural-name="replication-domains"
@@ -117,14 +117,17 @@
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="window-size">
+ <adm:property name="window-size" advanced="true">
<adm:synopsis>
Specifies the window size that the directory server will use when
communicating with Replication Servers.
</adm:synopsis>
+ <adm:description>
+ This option may be deprecated and removed in future releases.
+ </adm:description>
<adm:default-behavior>
<adm:defined>
- <adm:value>100</adm:value>
+ <adm:value>100000</adm:value>
</adm:defined>
</adm:default-behavior>
<adm:syntax>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
index b10c852..c2ca16b 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
@@ -24,7 +24,7 @@
!
!
! Copyright 2007-2010 Sun Microsystems, Inc.
- ! Portions copyright 2011 ForgeRock AS
+ ! Portions copyright 2011-2013 ForgeRock AS
! -->
<adm:managed-object name="replication-server"
plural-name="replication-servers"
@@ -94,16 +94,19 @@
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="window-size">
+ <adm:property name="window-size" advanced="true">
<adm:synopsis>
Specifies the window size that the
<adm:user-friendly-name />
uses when communicating with other
<adm:user-friendly-plural-name />.
</adm:synopsis>
+ <adm:description>
+ This option may be deprecated and removed in future releases.
+ </adm:description>
<adm:default-behavior>
<adm:defined>
- <adm:value>100</adm:value>
+ <adm:value>100000</adm:value>
</adm:defined>
</adm:default-behavior>
<adm:syntax>
diff --git a/opends/src/admin/messages/ReplicationDomainCfgDefn.properties b/opends/src/admin/messages/ReplicationDomainCfgDefn.properties
index 00502ae..31b3f41 100644
--- a/opends/src/admin/messages/ReplicationDomainCfgDefn.properties
+++ b/opends/src/admin/messages/ReplicationDomainCfgDefn.properties
@@ -41,5 +41,6 @@
property.solve-conflicts.synopsis=Indicates if this server solves conflict.
property.solve-conflicts.description=This boolean indicates if this domain keeps the historical information necessary to solve conflicts. When set to false the server will not maintain historical information and will therefore not be able to solve conflict. This should therefore be done only if the replication is used in a single master type of deployment.
property.window-size.synopsis=Specifies the window size that the directory server will use when communicating with Replication Servers.
+property.window-size.description=This option may be deprecated and removed in future releases.
relation.external-changelog-domain.user-friendly-name=External Changelog Domain
relation.external-changelog-domain.synopsis=The External Changelog Domain provides configuration of the external changelog for the replication domain.
diff --git a/opends/src/admin/messages/ReplicationServerCfgDefn.properties b/opends/src/admin/messages/ReplicationServerCfgDefn.properties
index a051e39..de7b9de 100644
--- a/opends/src/admin/messages/ReplicationServerCfgDefn.properties
+++ b/opends/src/admin/messages/ReplicationServerCfgDefn.properties
@@ -21,3 +21,4 @@
property.weight.synopsis=The weight of the replication server.
property.weight.description=The weight affected to the replication server. Each replication server of the topology has a weight. When combined together, the weights of the replication servers of a same group can be translated to a percentage that determines the quantity of directory servers of the topology that should be connected to a replication server. For instance imagine a topology with 3 replication servers (with the same group id) with the following weights: RS1=1, RS2=1, RS3=2. This means that RS1 should have 25% of the directory servers connected in the topology, RS2 25%, and RS3 50%. This may be useful if the replication servers of the topology have a different power and one wants to spread the load between the replication servers according to their power.
property.window-size.synopsis=Specifies the window size that the Replication Server uses when communicating with other Replication Servers.
+property.window-size.description=This option may be deprecated and removed in future releases.
--
Gitblit v1.10.0