From f312ec4a15ca08a406c045748e9d627fe1e31494 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Fri, 17 Nov 2006 13:46:39 +0000
Subject: [PATCH] The synchronization changelog monitoring information has a counter named waiting-changes that publish the number of updates known by the changelog server that have not yest been sent to each ldap server because they are too slow to replay them.
---
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
index a11c2bd..cb6440f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
@@ -27,7 +27,6 @@
package org.opends.server.synchronization.plugin;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
-import static org.opends.server.util.TimeThread.getTime;
import static org.opends.server.synchronization.common.LogMessages.*;
import static org.opends.server.synchronization.plugin.Historical.*;
import static org.opends.server.synchronization.protocol.OperationContext.*;
@@ -308,11 +307,7 @@
monitor = new SynchronizationMonitor(this);
DirectoryServer.registerMonitorProvider(monitor);
- // TODO : read RUV from database an make sure we don't
- // generate changeNumber smaller than ChangeNumbers in the RUV
- long startingChangeNumber = getTime();
- changeNumberGenerator = new ChangeNumberGenerator(serverId,
- startingChangeNumber);
+ changeNumberGenerator = new ChangeNumberGenerator(serverId, state);
/*
* create the broker object used to publish and receive changes
*/
@@ -1213,7 +1208,8 @@
{
synchronized (pendingChanges)
{
- pendingChanges.remove(changeNumber);
+ PendingChange change = pendingChanges.get(changeNumber);
+ change.setCommitted(true);
pushCommittedChanges();
}
}
@@ -1631,7 +1627,8 @@
while ((firstChange != null) && firstChange.isCommitted())
{
- if (firstChange.getOp().isSynchronizationOperation() == false)
+ if ((firstChange.getOp() != null ) &&
+ (firstChange.getOp().isSynchronizationOperation() == false))
{
numSentUpdates++;
broker.publish(firstChange.getMsg());
--
Gitblit v1.10.0