From ac01c6ce7d9a06832d5e5c87f6ebddf83b23dc09 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 05 Jul 2011 14:37:19 +0000
Subject: [PATCH] Partial fix for OPENDJ-115: Make replication connection timeouts and various monitoring intervals configurable
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java | 2 +-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java | 6 +++---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java | 5 +++++
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
index 769aa1e..7a4fa69 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
@@ -83,6 +83,11 @@
*/
public static final int HANDSHAKE_TIMEOUT = 4000;
+ /**
+ * The default connection timeout.
+ */
+ public static final int CONNECTION_TIMEOUT = 4000;
+
/**
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 5bb0d76..c529d5a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -522,7 +522,7 @@
InetSocketAddress ServerAddr = new InetSocketAddress(
InetAddress.getByName(hostname), Integer.parseInt(port));
socket.setTcpNoDelay(true);
- socket.connect(ServerAddr, 500);
+ socket.connect(ServerAddr, ReplSessionSecurity.CONNECTION_TIMEOUT);
session = replSessionSecurity.createClientSession(socket,
ReplSessionSecurity.HANDSHAKE_TIMEOUT);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
index af7bbf0..860c365 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -1179,7 +1179,7 @@
socket = new Socket();
socket.setReceiveBufferSize(1000000);
socket.setTcpNoDelay(true);
- socket.connect(serverAddr, 500);
+ socket.connect(serverAddr, ReplSessionSecurity.CONNECTION_TIMEOUT);
localSession = replSessionSecurity.createClientSession(
socket, ReplSessionSecurity.HANDSHAKE_TIMEOUT);
boolean isSslEncryption = replSessionSecurity
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
index 31added..2e996c3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
@@ -953,7 +953,7 @@
new InetSocketAddress("localhost", port);
Socket socket = new Socket();
socket.setTcpNoDelay(true);
- socket.connect(serverAddr, 500);
+ socket.connect(serverAddr, ReplSessionSecurity.CONNECTION_TIMEOUT);
// Create client session
fakePort++;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index ce82b3e..61dd19b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -198,7 +198,7 @@
newClientWithFirstChanges();
newClientWithChangefromServer1();
newClientWithChangefromServer2();
- newClientWithUnknownChanges();
+ newClientWithUnknownChanges();
stopChangelog();
exportBackend();
backupRestore();
@@ -770,7 +770,7 @@
debugInfo("Starting changelogChaining");
replicationServer.clearDb();
TestCaseUtils.initializeTestBackend(true);
-
+
for (int itest = 0; itest <2; itest++)
{
ReplicationBroker broker2 = null;
@@ -1010,7 +1010,7 @@
Socket socket = new Socket();
socket.setReceiveBufferSize(1000000);
socket.setTcpNoDelay(true);
- socket.connect(ServerAddr, 500);
+ socket.connect(ServerAddr, ReplSessionSecurity.CONNECTION_TIMEOUT);
ReplSessionSecurity replSessionSecurity = getReplSessionSecurity();
ProtocolSession session =
replSessionSecurity.createClientSession(socket,
--
Gitblit v1.10.0