From d66dc6115cf5fd6ecac0ef6074a1fe3d14987a13 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 08 Aug 2016 08:05:17 +0000
Subject: [PATCH] ReplicationDomainMonitorData.java: improved traces, made more readable
---
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java | 9 ++++-----
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitorData.java | 20 ++++++++++++++------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java
index 636cdec..d826cca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitor.java
@@ -283,11 +283,11 @@
{
// Here is the RS state : list <serverID, lastCSN>
// For each LDAP Server, we keep the max CSN across the RSes
- ServerState replServerState = msg.getReplServerDbState();
- pendingMonitorData.setMaxCSNs(replServerState);
+ ServerState replServerDbState = msg.getReplServerDbState();
+ pendingMonitorData.setMaxCSNs(replServerDbState);
// store the remote RS states.
- pendingMonitorData.setRSState(msg.getSenderID(), replServerState);
+ pendingMonitorData.setRSState(msg.getSenderID(), replServerDbState);
// Store the remote LDAP servers states
for (int dsServerId : toIterable(msg.ldapIterator()))
@@ -295,8 +295,7 @@
ServerState dsServerState = msg.getLDAPServerState(dsServerId);
pendingMonitorData.setMaxCSNs(dsServerState);
pendingMonitorData.setLDAPServerState(dsServerId, dsServerState);
- pendingMonitorData.setFirstMissingDate(dsServerId,
- msg.getLDAPApproxFirstMissingDate(dsServerId));
+ pendingMonitorData.setFirstMissingDate(dsServerId, msg.getLDAPApproxFirstMissingDate(dsServerId));
}
// Process the latency reported by the remote RSi on its connections
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitorData.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitorData.java
index f479b07..5403d15 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitorData.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationDomainMonitorData.java
@@ -132,6 +132,7 @@
for (Entry<Integer, ServerState> entry : ldapStates.entrySet())
{
+ clear(mds);
final Integer lsiServerId = entry.getKey();
final ServerState lsiState = entry.getValue();
long lsiMissingChanges = computeMissingChanges(mds, lsiServerId, lsiState);
@@ -140,6 +141,7 @@
}
this.missingChanges.put(lsiServerId, lsiMissingChanges);
+ logger.trace("Complete monitor data : Missing changes (%5d)=%s", lsiServerId, mds);
}
// Computes the missing changes counters for RS :
@@ -147,6 +149,7 @@
for (Entry<Integer, ServerState> entry : rsStates.entrySet())
{
+ clear(mds);
final Integer lsiServerId = entry.getKey();
final ServerState lsiState = entry.getValue();
long lsiMissingChanges = computeMissingChanges(mds, null, lsiState);
@@ -155,14 +158,15 @@
}
this.missingChangesRS.put(lsiServerId, lsiMissingChanges);
-
- if (logger.isTraceEnabled())
- {
- logger.trace("Complete monitor data : Missing changes (" + lsiServerId + ")=" + mds);
- }
+ logger.trace("Complete monitor data : Missing changes RS (%5d)=%s", lsiServerId, mds);
}
}
+ private void clear(StringBuilder mds)
+ {
+ mds.setLength(0);
+ }
+
private long computeMissingChanges(StringBuilder mds, final Integer lsiServerId, final ServerState lsiState)
{
long lsiMissingChanges = 0;
@@ -176,7 +180,11 @@
int missingChangesLsiLsj = CSN.diffSeqNum(lsjMaxCSN, lsiLastCSN);
if (logger.isTraceEnabled()) {
- mds.append("+ diff(")
+ if (mds.length() > 0)
+ {
+ mds.append(" + ");
+ }
+ mds.append("diff(")
.append(lsjMaxCSN).append("-").append(lsiLastCSN).append(")=").append(missingChangesLsiLsj);
}
/*
--
Gitblit v1.10.0