From becb4e248a76ade66e1c410bc53dc800430552b0 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 19 Aug 2014 14:32:35 +0000
Subject: [PATCH] Forward port fix OPENDJ-1190: Under rare circumstances the DS replication recovery thread (RSUpdater) can spin
---
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 57e546b..2ee7049 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -4235,13 +4235,25 @@
if (lastRetrievedChange != null)
{
+ if (logger.isInfoEnabled())
+ logger.info(LocalizableMessage.raw("publish loop"
+ + " >=" + currentStartCSN + " <=" + endCSN
+ + " nentries=" + op.getEntriesSent()
+ + " result=" + op.getResultCode()
+ + " lastRetrievedChange=" + lastRetrievedChange));
currentStartCSN = lastRetrievedChange;
}
else
{
+ if (logger.isInfoEnabled())
+ logger.info(LocalizableMessage.raw("publish loop"
+ + " >=" + currentStartCSN + " <=" + endCSN
+ + " nentries=" + op.getEntriesSent()
+ + " result=" + op.getResultCode()
+ + " no changes"));
currentStartCSN = endCSN;
}
- } while (pendingChanges.recoveryUntil(lastRetrievedChange)
+ } while (pendingChanges.recoveryUntil(currentStartCSN)
&& op.getResultCode().equals(ResultCode.SUCCESS));
return op.getResultCode().equals(ResultCode.SUCCESS);
--
Gitblit v1.10.0