From df8af541e0b60da31ebd5963d50bb2646fea9846 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 22 Sep 2014 09:55:15 +0000
Subject: [PATCH] OPENDJ-1467 : File Based Changelog must support replicas temporarily leaving the topology
---
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index ceca244..b39b6d5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -827,6 +827,7 @@
final ChangeNumberIndexer indexer = cnIndexer.get();
if (indexer != null)
{
+ notifyReplicaOnline(indexer, baseDN, updateMsg.getCSN().getServerId());
indexer.publishUpdateMsg(baseDN, updateMsg);
}
return pair.getSecond(); // replica DB was created
@@ -839,15 +840,25 @@
final ChangeNumberIndexer indexer = cnIndexer.get();
if (indexer != null)
{
+ notifyReplicaOnline(indexer, baseDN, heartbeatCSN.getServerId());
indexer.publishHeartbeat(baseDN, heartbeatCSN);
}
}
+ private void notifyReplicaOnline(final ChangeNumberIndexer indexer, final DN baseDN, final int serverId)
+ throws ChangelogException
+ {
+ if (indexer.isReplicaOffline(baseDN, serverId))
+ {
+ replicationEnv.notifyReplicaOnline(baseDN, serverId);
+ }
+ }
+
/** {@inheritDoc} */
@Override
- public void replicaOffline(final DN baseDN, final CSN offlineCSN) throws ChangelogException
+ public void notifyReplicaOffline(final DN baseDN, final CSN offlineCSN) throws ChangelogException
{
- replicationEnv.addOfflineReplica(baseDN, offlineCSN);
+ replicationEnv.notifyReplicaOffline(baseDN, offlineCSN);
final ChangeNumberIndexer indexer = cnIndexer.get();
if (indexer != null)
{
--
Gitblit v1.10.0