From 0a9135e3444bbefde6188f456b9c9772a816096d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Sep 2013 15:17:14 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/DataServerHandler.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
index 26db6f2..ffaa1f4 100644
--- a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -136,7 +136,7 @@
if (debugEnabled())
{
TRACER.debugInfo("In RS " + replicationServer.getServerId()
- + ", DS " + getServerId() + " for baseDn " + getBaseDN()
+ + ", DS " + getServerId() + " for baseDN=" + getBaseDN()
+ " has already generation id " + newGenId
+ " so no ChangeStatusMsg sent to him.");
}
@@ -150,7 +150,7 @@
if (debugEnabled())
{
TRACER.debugInfo("In RS " + replicationServer.getServerId()
- + ", closing connection to DS " + getServerId() + " for baseDn "
+ + ", closing connection to DS " + getServerId() + " for baseDN="
+ getBaseDN() + " to force reconnection as new local"
+ " generationId and remote one match and DS is in bad gen id: "
+ newGenId);
@@ -220,7 +220,7 @@
{
TRACER.debugInfo("In RS " + replicationServer.getServerId()
+ " Sending change status " + origin + " to " + getServerId()
- + " for baseDn " + getBaseDN() + ":\n" + csMsg);
+ + " for baseDN=" + getBaseDN() + ":\n" + csMsg);
}
session.publish(csMsg);
@@ -361,7 +361,8 @@
heartbeatInterval = serverStartMsg.getHeartbeatInterval();
// generic stuff
- setBaseDNAndDomain(serverStartMsg.getBaseDn(), true);
+ DN baseDN = DN.decode(serverStartMsg.getBaseDn());
+ setBaseDNAndDomain(baseDN, true);
setInitialServerState(serverStartMsg.getServerState());
setSendWindowSize(serverStartMsg.getWindowSize());
@@ -477,7 +478,7 @@
Message message = INFO_REPLICATION_SERVER_CONNECTION_FROM_DS
.get(getReplicationServerId(), getServerId(),
- replicationServerDomain.getBaseDn(),
+ replicationServerDomain.getBaseDN().toNormalizedString(),
session.getReadableRemoteAddress());
logError(message);
@@ -550,7 +551,7 @@
if (serverId != 0)
{
return "Replica DS(" + serverId + ") for domain \""
- + replicationServerDomain.getBaseDn() + "\"";
+ + replicationServerDomain.getBaseDN() + "\"";
}
return "Unknown server";
}
--
Gitblit v1.10.0