From df0e36ba23d4992009b1b694bb5cb37ba9587836 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Tue, 23 Jun 2009 15:13:22 +0000
Subject: [PATCH] Remove dead code in the replication without any functionality change.
---
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 52 ++--------------------------------------------------
1 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 184d2ef..baa4737 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -98,7 +98,6 @@
*/
public class ReplicationServerDomain extends MonitorProvider<MonitorProviderCfg>
{
- private final Object flowControlLock = new Object();
private final String baseDn;
// The Status analyzer that periodically verifis if the connected DSs are
// late or not
@@ -1293,16 +1292,9 @@
* So this methods simply need to check that dependencies are OK
* and update this replicaId RUV
*
- * TODO : dependency :
- * before forwarding change, we should check that the dependency
- * that is indicated in this change is OK (change already in the RUV)
*/
msg = handler.take();
- synchronized (flowControlLock)
- {
- if (handler.restartAfterSaturation(null))
- flowControlLock.notifyAll();
- }
+
return msg;
}
@@ -1664,7 +1656,7 @@
} catch (IOException ioe)
{
/*
- * An error happened trying the send a routabled message
+ * An error happened trying the send a routable message
* to its destination server.
* Send back an error to the originator of the message.
*/
@@ -1754,46 +1746,6 @@
}
/**
- * Check if some server Handler should be removed from flow control state.
- * @throws IOException If an error happened.
- */
- public void checkAllSaturation() throws IOException
- {
- for (ReplicationServerHandler handler : replicationServers.values())
- {
- handler.checkWindow();
- }
-
- for (DataServerHandler handler : directoryServers.values())
- {
- handler.checkWindow();
- }
- }
-
- /**
- * Check if a server that was in flow control can now restart
- * sending updates.
- * @param sourceHandler The server that must be checked.
- * @return true if the server can restart sending changes.
- * false if the server can't restart sending changes.
- */
- public boolean restartAfterSaturation(MessageHandler sourceHandler)
- {
- for (MessageHandler handler : replicationServers.values())
- {
- if (!handler.restartAfterSaturation(sourceHandler))
- return false;
- }
-
- for (MessageHandler handler : directoryServers.values())
- {
- if (!handler.restartAfterSaturation(sourceHandler))
- return false;
- }
- return true;
- }
-
- /**
* Send a TopologyMsg to all the connected directory servers in order to
* let.
* them know the topology (every known DSs and RSs)
--
Gitblit v1.10.0