From a3dad177f76ca95ba2a01ba58e53fb3441ebe0ac Mon Sep 17 00:00:00 2001
From: mrossign <mrossign@localhost>
Date: Fri, 19 Dec 2008 11:59:56 +0000
Subject: [PATCH] - support for dynamic domain group id reconfiguration in replication server - unit test for group id reconfiguration in replication server as well as in directory server
---
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 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 2768301..df6b067 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -886,12 +886,12 @@
}
/**
- * Stop operations with a list of servers.
+ * Stop operations with a list of replication servers.
*
* @param replServers the replication servers for which
* we want to stop operations
*/
- public void stopServers(Collection<String> replServers)
+ public void stopReplicationServers(Collection<String> replServers)
{
for (ServerHandler handler : replicationServers.values())
{
@@ -901,6 +901,24 @@
}
/**
+ * Stop operations with all servers this domain is connected with (RS and DS).
+ */
+ public void stopAllServers()
+ {
+ // Close session with other replication servers
+ for (ServerHandler serverHandler : replicationServers.values())
+ {
+ stopServer(serverHandler);
+ }
+
+ // Close session with other LDAP servers
+ for (ServerHandler serverHandler : directoryServers.values())
+ {
+ stopServer(serverHandler);
+ }
+ }
+
+ /**
* Checks that a DS is not connected with same id.
*
* @param handler the DS we want to check
@@ -1478,17 +1496,7 @@
// Terminate the assured timer
assuredTimeoutTimer.cancel();
- // Close session with other changelogs
- for (ServerHandler serverHandler : replicationServers.values())
- {
- stopServer(serverHandler);
- }
-
- // Close session with other LDAP servers
- for (ServerHandler serverHandler : directoryServers.values())
- {
- stopServer(serverHandler);
- }
+ stopAllServers();
// Shutdown the dbHandlers
synchronized (sourceDbHandlers)
--
Gitblit v1.10.0