From 71ebb3724c79a7d1218c36f080acd6ee162b9cd2 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Thu, 26 Apr 2007 06:31:01 +0000
Subject: [PATCH] Rename the class with names containing synchronization or changelog. Replace most of the changelog occurences with replication server. (issue 1090)
---
opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index 24ef2b3..364612d 100644
--- a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -119,9 +119,9 @@
* This class implements the bulk part of the.of the Directory Server side
* of the replication code.
* It contains the root method for publishing a change,
- * processing a change received from the changelog service,
+ * processing a change received from the replicationServer service,
* handle conflict resolution,
- * handle protocol messages from the changelog server.
+ * handle protocol messages from the replicationServer.
*/
public class ReplicationDomain extends DirectoryThread
implements ConfigurationChangeListener<MultimasterDomainCfg>
@@ -129,7 +129,7 @@
private ReplicationMonitor monitor;
private ChangeNumberGenerator changeNumberGenerator;
- private ChangelogBroker broker;
+ private ReplicationBroker broker;
private List<ListenerThread> synchroThreads =
new ArrayList<ListenerThread>();
@@ -248,7 +248,7 @@
private int listenerThreadNumber = 10;
private boolean receiveStatus = true;
- private Collection<String> changelogServers;
+ private Collection<String> replicationServers;
private DN baseDN;
@@ -277,7 +277,7 @@
super("replication flush");
// Read the configuration parameters.
- changelogServers = configuration.getChangelogServer();
+ replicationServers = configuration.getChangelogServer();
serverId = (short) configuration.getServerId();
baseDN = configuration.getSynchronizationDN();
maxReceiveQueue = configuration.getMaxReceiveQueue();
@@ -327,12 +327,12 @@
*/
try
{
- broker = new ChangelogBroker(state, baseDN, serverId, maxReceiveQueue,
+ broker = new ReplicationBroker(state, baseDN, serverId, maxReceiveQueue,
maxReceiveDelay, maxSendQueue, maxSendDelay, window,
heartbeatInterval);
synchronized (broker)
{
- broker.start(changelogServers);
+ broker.start(replicationServers);
if (!receiveStatus)
broker.suspendReceive();
}
@@ -342,7 +342,7 @@
} catch (Exception e)
{
- /* TODO should mark that changelog service is
+ /* TODO should mark that replicationServer service is
* not available, log an error and retry upon timeout
* should we stop the modifications ?
*/
@@ -627,7 +627,7 @@
}
/**
- * Receives an update message from the changelog.
+ * Receives an update message from the replicationServer.
* also responsible for updating the list of pending changes
* @return the received message - null if none
*/
@@ -704,7 +704,7 @@
// - either during an export
// - or before an import really started
// For example, when we publish a request and the
- // changelog did not find any import source.
+ // replicationServer did not find any import source.
abandonImportExport((ErrorMessage)msg);
}
}
@@ -1027,20 +1027,20 @@
DirectoryServer.deregisterMonitorProvider(monitor.getMonitorInstanceName());
- // stop the ChangelogBroker
+ // stop the ReplicationBroker
broker.stop();
}
/**
- * Get the name of the changelog server to which this domain is currently
+ * Get the name of the replicationServer to which this domain is currently
* connected.
*
- * @return the name of the changelog server to which this domain
+ * @return the name of the replicationServer to which this domain
* is currently connected.
*/
- public String getChangelogServer()
+ public String getReplicationServer()
{
- return broker.getChangelogServer();
+ return broker.getReplicationServer();
}
/**
@@ -1604,7 +1604,7 @@
}
/**
- * Push all committed local changes to the changelog service.
+ * Push all committed local changes to the replicationServer service.
* PRECONDITION : The pendingChanges lock must be held before calling
* this method.
*/
@@ -1734,10 +1734,10 @@
try
{
- broker.start(changelogServers);
+ broker.start(replicationServers);
} catch (Exception e)
{
- /* TODO should mark that changelog service is
+ /* TODO should mark that replicationServer service is
* not available, log an error and retry upon timeout
* should we stop the modifications ?
*/
@@ -2616,7 +2616,7 @@
// Re-exchange state with SS
broker.stop();
- broker.start(changelogServers);
+ broker.start(replicationServers);
}
catch(Exception e)
@@ -2803,16 +2803,16 @@
MultimasterDomainCfg configuration)
{
// server id and base dn are readonly.
- // The other parameters needs to be renegociated with the Changelog Server.
- // so that requires restarting the session with the Changelog Server.
- changelogServers = configuration.getChangelogServer();
+ // The other parameters needs to be renegociated with the ReplicationServer.
+ // so that requires restarting the session with the ReplicationServer.
+ replicationServers = configuration.getChangelogServer();
maxReceiveQueue = configuration.getMaxReceiveQueue();
maxReceiveDelay = (int) configuration.getMaxReceiveDelay();
maxSendQueue = configuration.getMaxSendQueue();
maxSendDelay = (int) configuration.getMaxSendDelay();
window = configuration.getWindowSize();
heartbeatInterval = configuration.getHeartbeatInterval();
- broker.changeConfig(changelogServers, maxReceiveQueue, maxReceiveDelay,
+ broker.changeConfig(replicationServers, maxReceiveQueue, maxReceiveDelay,
maxSendQueue, maxSendDelay, window, heartbeatInterval);
return new ConfigChangeResult(ResultCode.SUCCESS, false);
--
Gitblit v1.10.0