From 7a14ad560ca4450eef1f712c21b27cfbb3673ec2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 10 Jul 2014 15:21:18 +0000
Subject: [PATCH] OPENDJ-1453 Make the Medium Consistency Point support replicas temporarily leaving the topology
---
opendj3-server-dev/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
index 4186a42..fca0b89 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
@@ -101,7 +101,7 @@
if (now > session.getLastPublishTime() + heartbeatInterval)
{
final CSN csn = new CSN(now, 0, serverId);
- session.publish(ChangeTimeHeartbeatMsg.heartbeatMsg(csn));
+ session.publish(new ChangeTimeHeartbeatMsg(csn));
lastHeartbeatTime = csn.getTime();
}
@@ -128,26 +128,6 @@
}
}
}
-
- if (shutdown)
- {
- /*
- * Shortcoming: this thread is restarted each time the DS reconnects,
- * e.g. during load balancing. This is not that much of a problem
- * because the ChangeNumberIndexer tolerates receiving replica offline
- * heartbeats and then receiving messages back again.
- */
- /*
- * However, during shutdown we need to be sure that all pending client
- * operations have either completed or have been aborted before shutting
- * down replication. Otherwise, the medium consistency will move forward
- * without knowing about these changes.
- */
- final long now = System.currentTimeMillis();
- final int seqNum = lastHeartbeatTime == now ? 1 : 0;
- final CSN offlineCSN = new CSN(now, seqNum, serverId);
- session.publish(ChangeTimeHeartbeatMsg.replicaOfflineMsg(offlineCSN));
- }
}
catch (IOException e)
{
--
Gitblit v1.10.0