From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java | 86 ++++++++++++++++++++----------------------
1 files changed, 41 insertions(+), 45 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
index 8ebfc99..dc88b92 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -43,7 +43,6 @@
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.replication.protocol.ProtocolVersion.*;
import static org.opends.server.replication.protocol.StartECLSessionMsg
.ECLRequestType.*;
@@ -206,7 +205,7 @@
*/
private void computeNextEligibleMessageForDomain(String opId)
{
- if (debugEnabled())
+ if (logger.isTraceEnabled())
debugInfo(opId, "ctxt=" + this);
assert(nextMsg == null);
@@ -219,7 +218,7 @@
{
final boolean hasBecomeEligible = isEligible(nextNonEligibleMsg);
- if (debugEnabled())
+ if (logger.isTraceEnabled())
debugInfo(opId, "stored nonEligibleMsg " + nextNonEligibleMsg
+ " has now become eligible regarding the eligibleCSN ("
+ eligibleCSN + " ): " + hasBecomeEligible);
@@ -240,13 +239,13 @@
return;
}
- if (debugEnabled())
+ if (logger.isTraceEnabled())
debugInfo(opId, "got new message : [newMsg=" + newMsg + "] "
+ dumpState());
final boolean isEligible = isEligible(newMsg);
- if (debugEnabled())
+ if (logger.isTraceEnabled())
debugInfo(opId, "newMsg isEligible=" + isEligible + " since "
+ "newMsg=[" + toString(newMsg.getCSN()) + "] eligibleCSN=["
+ toString(eligibleCSN) + "] " + dumpState());
@@ -263,7 +262,7 @@
}
catch(Exception e)
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
}
}
@@ -300,7 +299,7 @@
private void debugInfo(String opId, String message)
{
- TRACER.debugInfo("In ECLServerHandler, for baseDN="
+ logger.trace("In ECLServerHandler, for baseDN="
+ mh.getBaseDNString() + " getNextEligibleMessageForDomain(" + opId
+ ") " + message);
}
@@ -554,13 +553,13 @@
}
catch(DirectoryException de)
{
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ logger.traceException(de);
releaseCursor();
throw de;
}
catch(Exception e)
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
releaseCursor();
throw new DirectoryException(
ResultCode.OPERATIONS_ERROR,
@@ -711,7 +710,7 @@
}
catch(Exception e)
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
// FIXME:ECL do not publish internal exception plumb to the client
throw new DirectoryException(
ResultCode.OPERATIONS_ERROR,
@@ -719,8 +718,8 @@
e),
e);
}
- if (debugEnabled())
- TRACER.debugInfo("initializeChangelogDomainCtxts() ends with "
+ if (logger.isTraceEnabled())
+ logger.trace("initializeChangelogDomainCtxts() ends with "
+ dumpState());
}
@@ -911,8 +910,8 @@
@Override
public void shutdown()
{
- if (debugEnabled())
- TRACER.debugInfo(this + " shutdown()");
+ if (logger.isTraceEnabled())
+ logger.trace(this + " shutdown()");
releaseCursor();
for (DomainContext domainCtxt : domainCtxts) {
if (!domainCtxt.unRegisterHandler()) {
@@ -1025,7 +1024,7 @@
}
catch(Exception e)
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
ERR_INVALID_COOKIE_SYNTAX.get(cookie));
}
@@ -1066,8 +1065,8 @@
registerIntoDomain();
- if (debugEnabled())
- TRACER.debugInfo(getClass().getCanonicalName() + " " + getOperationId()
+ if (logger.isTraceEnabled())
+ logger.trace(getClass().getCanonicalName() + " " + getOperationId()
+ " initialized: " + " " + dumpState() + " " + " "
+ domaimCtxtsToString(""));
}
@@ -1142,7 +1141,7 @@
}
catch(DirectoryException de)
{
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ logger.traceException(de);
}
return null;
}
@@ -1154,8 +1153,8 @@
*/
public ECLUpdateMsg getNextECLUpdate() throws DirectoryException
{
- if (debugEnabled())
- TRACER.debugInfo("In cn=changelog" + this +
+ if (logger.isTraceEnabled())
+ logger.trace("In cn=changelog" + this +
" getNextECLUpdate starts: " + dumpState());
ECLUpdateMsg oldestChange = null;
@@ -1226,8 +1225,8 @@
if (searchPhase == PERSISTENT_PHASE)
{
- if (debugEnabled())
- TRACER.debugInfo(domaimCtxtsToString(
+ if (logger.isTraceEnabled())
+ logger.trace(domaimCtxtsToString(
"In getNextECLUpdate (persistent): "
+ "looking for the generalized oldest change"));
@@ -1246,7 +1245,7 @@
}
catch(Exception e)
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
throw new DirectoryException(
ResultCode.OPERATIONS_ERROR,
LocalizableMessage.raw("Exception raised: "),
@@ -1256,14 +1255,14 @@
if (oldestChange != null)
{
final CSN csn = oldestChange.getUpdateMsg().getCSN();
- if (debugEnabled())
- TRACER.debugInfo("getNextECLUpdate updates previousCookie:" + csn);
+ if (logger.isTraceEnabled())
+ logger.trace("getNextECLUpdate updates previousCookie:" + csn);
previousCookie.update(oldestChange.getBaseDN(), csn);
oldestChange.setCookie(previousCookie);
- if (debugEnabled())
- TRACER.debugInfo("getNextECLUpdate returns result oldestChange="
+ if (logger.isTraceEnabled())
+ logger.trace("getNextECLUpdate returns result oldestChange="
+ oldestChange);
}
return oldestChange;
@@ -1318,8 +1317,8 @@
final CSN csnFromCNIndexDB = currentRecord.getCSN();
final DN baseDNFromCNIndexDB = currentRecord.getBaseDN();
- if (debugEnabled())
- TRACER.debugInfo("assignChangeNumber() comparing the replicaDB's and"
+ if (logger.isTraceEnabled())
+ logger.trace("assignChangeNumber() comparing the replicaDB's and"
+ " CNIndexDB's baseDNs :" + baseDNFromReplicaDB + "?="
+ baseDNFromCNIndexDB + " timestamps:" + asDate(csnFromReplicaDB)
+ " ?older" + asDate(csnFromCNIndexDB));
@@ -1329,8 +1328,8 @@
{
// We matched the ReplicaDB change with a record in the CNIndexDB
// => set the changeNumber in memory and return the change to the client
- if (debugEnabled())
- TRACER.debugInfo("assignChangeNumber() assigning changeNumber="
+ if (logger.isTraceEnabled())
+ logger.trace("assignChangeNumber() assigning changeNumber="
+ currentRecord.getChangeNumber() + " to change="
+ replicaDBChange);
@@ -1347,8 +1346,8 @@
// the change from the replicaDB is older
// it should have been stored lately
// let's continue to traverse the replicaDBs
- if (debugEnabled())
- TRACER.debugInfo("assignChangeNumber() will skip " + csnFromReplicaDB
+ if (logger.isTraceEnabled())
+ logger.trace("assignChangeNumber() will skip " + csnFromReplicaDB
+ " and read next change from the regular changelog.");
return false; // TO BE CHECKED
}
@@ -1360,24 +1359,21 @@
try
{
// keep traversing the CNIndexDB searching for the replicaDB change
- if (debugEnabled())
- TRACER.debugInfo("assignChangeNumber() will skip " + csnFromCNIndexDB
+ if (logger.isTraceEnabled())
+ logger.trace("assignChangeNumber() will skip " + csnFromCNIndexDB
+ " and read next change from the CNIndexDB.");
isEndOfCNIndexDBReached = !cnIndexDBCursor.next();
- if (debugEnabled())
- TRACER.debugInfo("assignChangeNumber() has skipped to changeNumber="
+ if (logger.isTraceEnabled())
+ logger.trace("assignChangeNumber() has skipped to changeNumber="
+ currentRecord.getChangeNumber() + " csn="
+ currentRecord.getCSN() + " End of CNIndexDB ?"
+ isEndOfCNIndexDBReached);
}
catch (ChangelogException e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
// FIXME There is an opportunity for an infinite loop here if the DB
// continuously throws ChangelogExceptions
}
@@ -1404,8 +1400,8 @@
{
// starvation of changelog messages
// all domain have been unactived means are covered
- if (debugEnabled())
- TRACER.debugInfo("In cn=changelog" + "," + this + " closeInitPhase(): "
+ if (logger.isTraceEnabled())
+ logger.trace("In cn=changelog" + "," + this + " closeInitPhase(): "
+ dumpState());
// go to persistent phase if one
@@ -1454,8 +1450,8 @@
}
}
- if (debugEnabled())
- TRACER.debugInfo("In cn=changelog," + this
+ if (logger.isTraceEnabled())
+ logger.trace("In cn=changelog," + this
+ " findDomainCtxtWithOldestChange() returns "
+ ((oldestCtxt != null) ? oldestCtxt.nextMsg : "-1"));
--
Gitblit v1.10.0