From f5bbe1f5939465538a2e7b3101a149cf4004a818 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 23 Jun 2014 09:29:29 +0000
Subject: [PATCH] OPENDJ-1453 Make the Medium Consistency Point support replicas temporarily leaving the topology
---
opendj-sdk/opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java b/opendj-sdk/opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
index f509938..51425a2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
@@ -107,7 +107,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();
}
@@ -137,26 +137,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