From ce949f4b26b4c2adcaae36784180e15a3d68abde Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 07 Oct 2011 10:09:52 +0000
Subject: [PATCH] Fix OPENDJ-115: Make replication connection timeouts and various monitoring intervals configurable
---
opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 787da14..ea5ee1e 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -60,6 +60,7 @@
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.common.*;
+import org.opends.server.replication.plugin.MultimasterReplication;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
import org.opends.server.util.LDIFReader;
@@ -307,9 +308,9 @@
newSocket = listenSocket.accept();
newSocket.setTcpNoDelay(true);
newSocket.setKeepAlive(true);
- session =
- replSessionSecurity.createServerSession(newSocket,
- ReplSessionSecurity.HANDSHAKE_TIMEOUT);
+ int timeoutMS = MultimasterReplication.getConnectionTimeoutMS();
+ session = replSessionSecurity.createServerSession(newSocket,
+ timeoutMS);
if (session == null) // Error, go back to accept
continue;
}
@@ -490,10 +491,9 @@
InetSocketAddress ServerAddr = new InetSocketAddress(
InetAddress.getByName(hostname), Integer.parseInt(port));
socket.setTcpNoDelay(true);
- socket.connect(ServerAddr, ReplSessionSecurity.CONNECTION_TIMEOUT);
-
- session = replSessionSecurity.createClientSession(socket,
- ReplSessionSecurity.HANDSHAKE_TIMEOUT);
+ int timeoutMS = MultimasterReplication.getConnectionTimeoutMS();
+ socket.connect(ServerAddr, timeoutMS);
+ session = replSessionSecurity.createClientSession(socket, timeoutMS);
ReplicationServerHandler handler = new ReplicationServerHandler(
session, queueSize, this.serverURL, serverId, this,
--
Gitblit v1.10.0