From 9279dc523105b11514e1c278fa3b5ecd811b6c29 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 28 May 2010 08:58:23 +0000
Subject: [PATCH] Fix specific replication tests and typos.
---
opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java | 39 ++++++++++---------
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 14 -------
opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java | 17 ++++++++
3 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
index c41073b..f777a84 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -770,7 +770,22 @@
// changelogdb start state, it means that the replication
// changelog db has been trimed and the cookie is not valid
// anymore.
- if (newDomainCtxt.startState.cover(rsd.getStartState())==false)
+ boolean cookieTooOld = false;
+ for (int serverId : rsd.getStartState())
+ {
+ ChangeNumber dbOldestChange =
+ rsd.getStartState().getMaxChangeNumber(serverId);
+ ChangeNumber providedChange =
+ newDomainCtxt.startState.getMaxChangeNumber(serverId);
+ if ((providedChange != null)
+ && (providedChange.older(dbOldestChange)))
+ {
+ cookieTooOld=true;
+ }
+ }
+
+ //if (newDomainCtxt.startState.cover(rsd.getStartState())==false)
+ if (cookieTooOld)
{
// the provided start
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
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 f152406..a3e3e18 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
@@ -859,7 +859,8 @@
* out which one is the best to connect to.
*/
if (debugEnabled())
- TRACER.debugInfo("phase 1 : will perform PhaseOneH with each RS in " +
+ debugInfo("serverId: " + serverId +
+ " phase 1 : will perform PhaseOneH with each RS in " +
" order to elect the preferred one");
// Get info from every available replication servers
@@ -876,8 +877,8 @@
// Best found, now initialize connection to this one (handshake phase 1)
if (debugEnabled())
- TRACER.debugInfo(
- "phase 2 : will perform PhaseOneH with the preferred RS="
+ debugInfo("serverId: " + serverId +
+ " phase 2 : will perform PhaseOneH with the preferred RS="
+ replicationServerInfo);
replicationServerInfo = performPhaseOneHandshake(
replicationServerInfo.getServerURL(), true);
@@ -1111,7 +1112,7 @@
if (debugEnabled())
{
- TRACER.debugInfo("RB for dn " + baseDn +
+ debugInfo("RB for dn " + baseDn +
" and with server id " + Integer.toString(serverId) + " computed " +
Integer.toString(nChanges) + " changes late.");
}
@@ -1204,7 +1205,7 @@
if (debugEnabled())
{
- TRACER.debugInfo("In RB for " + baseDn +
+ debugInfo("In RB for " + baseDn +
"\nRB HANDSHAKE SENT:\n" + serverStartMsg.toString() +
"\nAND RECEIVED:\n" + msg.toString());
}
@@ -1252,7 +1253,7 @@
logError(message);
} else if (debugEnabled())
{
- TRACER.debugInfo(message.toString());
+ debugInfo(message.toString());
}
}
error = true;
@@ -1260,7 +1261,7 @@
{
if ((e instanceof SocketTimeoutException) && debugEnabled())
{
- TRACER.debugInfo("Timeout trying to connect to RS " + server +
+ debugInfo("Timeout trying to connect to RS " + server +
" for dn: " + baseDn);
}
Message message = ERR_EXCEPTION_STARTING_SESSION_PHASE.get("1",
@@ -1271,7 +1272,7 @@
logError(message);
} else if (debugEnabled())
{
- TRACER.debugInfo(message.toString());
+ debugInfo(message.toString());
}
error = true;
}
@@ -1282,7 +1283,7 @@
if (localSession != null)
{
if (debugEnabled())
- TRACER.debugInfo("In RB, closing session after phase 1");
+ debugInfo("In RB, closing session after phase 1");
if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V4)
{
@@ -1379,7 +1380,7 @@
if (debugEnabled())
{
- TRACER.debugInfo("In RB for " + baseDn +
+ debugInfo("In RB for " + baseDn +
"\nRB HANDSHAKE SENT:\n" + serverStartECLMsg.toString() +
"\nAND RECEIVED:\n" + replServerStartDSMsg.toString());
}
@@ -1424,7 +1425,7 @@
logError(message);
} else if (debugEnabled())
{
- TRACER.debugInfo(message.toString());
+ debugInfo(message.toString());
}
}
error = true;
@@ -1432,7 +1433,7 @@
{
if ((e instanceof SocketTimeoutException) && debugEnabled())
{
- TRACER.debugInfo("Timeout trying to connect to RS " + server +
+ debugInfo("Timeout trying to connect to RS " + server +
" for dn: " + baseDn);
}
Message message = ERR_EXCEPTION_STARTING_SESSION_PHASE.get("1",
@@ -1443,7 +1444,7 @@
logError(message);
} else if (debugEnabled())
{
- TRACER.debugInfo(message.toString());
+ debugInfo(message.toString());
}
error = true;
}
@@ -1454,7 +1455,7 @@
if (localSession != null)
{
if (debugEnabled())
- TRACER.debugInfo("In RB, closing session after phase 1");
+ debugInfo("In RB, closing session after phase 1");
// V4 protocol introduces a StopMsg to properly end communications
if (!error)
@@ -1521,7 +1522,7 @@
*/
if (debugEnabled())
{
- TRACER.debugInfo("In RB for " + baseDn +
+ debugInfo("In RB for " + baseDn +
"\nRB HANDSHAKE SENT:\n" + startECLSessionMsg.toString());
// + "\nAND RECEIVED:\n" + topologyMsg.toString());
}
@@ -1602,7 +1603,7 @@
if (debugEnabled())
{
- TRACER.debugInfo("In RB for " + baseDn +
+ debugInfo("In RB for " + baseDn +
"\nRB HANDSHAKE SENT:\n" + startSessionMsg.toString() +
"\nAND RECEIVED:\n" + topologyMsg.toString());
}
@@ -2318,7 +2319,7 @@
}
}
if (debugEnabled())
- TRACER.debugInfo(this +
+ debugInfo(this +
" end restart : connected=" + connected +
" with RSid=" + this.getRsServerId() +
" genid=" + this.generationID);
@@ -3034,7 +3035,7 @@
public void receiveTopo(TopologyMsg topoMsg)
{
if (debugEnabled())
- TRACER.debugInfo(this + " receive TopologyMsg=" + topoMsg);
+ debugInfo(this + " receive TopologyMsg=" + topoMsg);
// Store new DS list
dsList = topoMsg.getDsList();
@@ -3116,7 +3117,7 @@
} else
{
if (debugEnabled())
- TRACER.debugInfo(this +
+ debugInfo(this +
" is not configured to send CN heartbeat interval");
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 07dceca..11c0dea 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -1415,20 +1415,6 @@
log(testCase + " Will verify server 3 has received expected entries");
receiveUpdatedEntries(server3, server3ID, updatedEntries);
- log(testCase + " Will verify no more msgs");
- while (true)
- {
- try
- {
- log(testCase + " Will receive");
- ReplicationMsg msg = server3.receive();
- fail("Receive unexpected message " + msg);
- } catch (SocketTimeoutException e)
- {
- // Test is a success
- break;
- }
- }
log("Successfully ending " + testCase);
}
finally
--
Gitblit v1.10.0