From 0faf556898392ebeee2038ca6ff72c57908ad653 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Tue, 06 Nov 2007 14:00:05 +0000
Subject: [PATCH] Fix for 2423 : remove some replication configuration parameters
---
opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 8 ----
opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml | 82 -----------------------------------------
2 files changed, 0 insertions(+), 90 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 f27e4de..278694a 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
@@ -108,88 +108,6 @@
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="max-receive-queue" mandatory="false"
- multi-valued="false">
- <adm:synopsis>
- Specifies the maximum length of the receive queue on the replication
- server before flow control must be activated.
- </adm:synopsis>
- <adm:default-behavior>
- <adm:defined>
- <adm:value>0</adm:value>
- </adm:defined>
- </adm:default-behavior>
- <adm:syntax>
- <adm:integer></adm:integer>
- </adm:syntax>
- <adm:profile name="ldap">
- <ldap:attribute>
- <ldap:name>ds-cfg-max-receive-queue</ldap:name>
- </ldap:attribute>
- </adm:profile>
- </adm:property>
- <adm:property name="max-receive-delay" mandatory="false"
- multi-valued="false">
- <adm:synopsis>
- Specifies the maximum delay on the replication server before flow
- control must be activated.
- </adm:synopsis>
- <adm:default-behavior>
- <adm:defined>
- <adm:value>0s</adm:value>
- </adm:defined>
- </adm:default-behavior>
- <adm:syntax>
- <adm:duration base-unit="s" allow-unlimited="false"
- upper-limit="2147483647" lower-limit="0" />
- </adm:syntax>
- <adm:profile name="ldap">
- <ldap:attribute>
- <ldap:name>ds-cfg-max-receive-delay</ldap:name>
- </ldap:attribute>
- </adm:profile>
- </adm:property>
- <adm:property name="max-send-queue" mandatory="false"
- multi-valued="false">
- <adm:synopsis>
- Specifies the maximum length of the send queue on the replication
- server before flow control must be activated.
- </adm:synopsis>
- <adm:default-behavior>
- <adm:defined>
- <adm:value>0</adm:value>
- </adm:defined>
- </adm:default-behavior>
- <adm:syntax>
- <adm:integer></adm:integer>
- </adm:syntax>
- <adm:profile name="ldap">
- <ldap:attribute>
- <ldap:name>ds-cfg-max-send-queue</ldap:name>
- </ldap:attribute>
- </adm:profile>
- </adm:property>
- <adm:property name="max-send-delay" mandatory="false"
- multi-valued="false">
- <adm:synopsis>
- Specifies the maximum send delay on the replication server before
- flow control must be activated.
- </adm:synopsis>
- <adm:default-behavior>
- <adm:defined>
- <adm:value>0s</adm:value>
- </adm:defined>
- </adm:default-behavior>
- <adm:syntax>
- <adm:duration upper-limit="2147483647" allow-unlimited="false"
- lower-limit="0" base-unit="s" />
- </adm:syntax>
- <adm:profile name="ldap">
- <ldap:attribute>
- <ldap:name>ds-cfg-max-send-delay</ldap:name>
- </ldap:attribute>
- </adm:profile>
- </adm:property>
<adm:property name="window-size" mandatory="false"
multi-valued="false">
<adm:synopsis>
diff --git a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index 01680b4..8b71fce 100644
--- a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -368,10 +368,6 @@
replicationServers = configuration.getReplicationServer();
serverId = (short) configuration.getServerId();
baseDN = configuration.getBaseDN();
- maxReceiveQueue = configuration.getMaxReceiveQueue();
- maxReceiveDelay = (int) configuration.getMaxReceiveDelay();
- maxSendQueue = configuration.getMaxSendQueue();
- maxSendDelay = (int) configuration.getMaxSendDelay();
window = configuration.getWindowSize();
heartbeatInterval = configuration.getHeartbeatInterval();
isolationpolicy = configuration.getIsolationPolicy();
@@ -3417,10 +3413,6 @@
// The other parameters needs to be renegociated with the ReplicationServer.
// so that requires restarting the session with the ReplicationServer.
replicationServers = configuration.getReplicationServer();
- maxReceiveQueue = configuration.getMaxReceiveQueue();
- maxReceiveDelay = (int) configuration.getMaxReceiveDelay();
- maxSendQueue = configuration.getMaxSendQueue();
- maxSendDelay = (int) configuration.getMaxSendDelay();
window = configuration.getWindowSize();
heartbeatInterval = configuration.getHeartbeatInterval();
broker.changeConfig(replicationServers, maxReceiveQueue, maxReceiveDelay,
--
Gitblit v1.10.0