From f62797edd0e611bc0d91b3b6f1817edac996b95e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Sep 2013 09:19:53 +0000
Subject: [PATCH] ReplicationServerDomain.java: Extracted toServerState() method. Renamed getDbServerState() to getLatestServerState().
---
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 50d67db..22303e4 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -1620,7 +1620,7 @@
int destination, ReplicationDomainMonitorData monitorData)
{
final MonitorMsg returnMsg = new MonitorMsg(sender, destination);
- returnMsg.setReplServerDbState(getDbServerState());
+ returnMsg.setReplServerDbState(getLatestServerState());
// Add the server state for each DS and RS currently in the topology.
for (int replicaId : toIterable(monitorData.ldapIterator()))
@@ -1669,7 +1669,7 @@
try
{
final MonitorMsg monitorMsg = new MonitorMsg(sender, destination);
- monitorMsg.setReplServerDbState(getDbServerState());
+ monitorMsg.setReplServerDbState(getLatestServerState());
// Add the server state for each connected DS and RS.
for (DataServerHandler dsHandler : this.connectedDSs.values())
@@ -1708,16 +1708,23 @@
}
/**
- * Returns the ServerState describing the newest CSNs from this domain.
+ * Returns the latest most current ServerState describing the newest CSNs for
+ * each server in this domain.
*
- * @return The ServerState describing the newest CSNs from this domain.
+ * @return The ServerState describing the newest CSNs for each server in in
+ * this domain.
*/
- public ServerState getDbServerState()
+ public ServerState getLatestServerState()
+ {
+ return toServerState(changelogDB.getDomainNewestCSNs(baseDN).values());
+ }
+
+ private ServerState toServerState(Collection<CSN> csns)
{
ServerState serverState = new ServerState();
- for (CSN newestCSN : changelogDB.getDomainNewestCSNs(baseDN).values())
+ for (CSN csn : csns)
{
- serverState.update(newestCSN);
+ serverState.update(csn);
}
return serverState;
}
@@ -2556,7 +2563,7 @@
{
if (ctHeartbeatState == null)
{
- ctHeartbeatState = getDbServerState().duplicate();
+ ctHeartbeatState = getLatestServerState().duplicate();
}
return ctHeartbeatState;
}
@@ -2584,17 +2591,17 @@
*/
public ServerState getEligibleState(CSN eligibleCSN)
{
- ServerState dbState = getDbServerState();
+ ServerState latestState = getLatestServerState();
// The result is initialized from the dbState.
// From it, we don't want to keep the changes newer than eligibleCSN.
- ServerState result = dbState.duplicate();
+ ServerState result = latestState.duplicate();
if (eligibleCSN != null)
{
- for (int serverId : dbState)
+ for (int serverId : latestState)
{
- CSN mostRecentDbCSN = dbState.getCSN(serverId);
+ CSN mostRecentDbCSN = latestState.getCSN(serverId);
try {
// Is the most recent change in the Db newer than eligible CSN ?
// if yes (like csn15 in the example above, then we have to go back
@@ -2635,12 +2642,7 @@
*/
public ServerState getStartState()
{
- ServerState domainStartState = new ServerState();
- for (CSN oldestCSN : changelogDB.getDomainOldestCSNs(baseDN).values())
- {
- domainStartState.update(oldestCSN);
- }
- return domainStartState;
+ return toServerState(changelogDB.getDomainOldestCSNs(baseDN).values());
}
/**
@@ -2809,7 +2811,7 @@
{
long res = 0;
- for (int serverId : getDbServerState())
+ for (int serverId : getLatestServerState())
{
CSN startCSN = startState.getCSN(serverId);
long serverIdRes = getCount(serverId, startCSN, endCSN);
@@ -2836,7 +2838,7 @@
public long getEligibleCount(CSN startCSN, CSN endCSN)
{
long res = 0;
- for (int serverId : getDbServerState()) {
+ for (int serverId : getLatestServerState()) {
CSN lStartCSN =
new CSN(startCSN.getTime(), startCSN.getSeqnum(), serverId);
res += getCount(serverId, lStartCSN, endCSN);
--
Gitblit v1.10.0