From 21446c9656ae9cde8f67d1ddb66cd2f99e9a23fb Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Mon, 19 Oct 2026 08:38:00 +0000
Subject: [PATCH] [#1207] Route total updates to a replica that has the server ID of a replication server, report such a replica, and draw the IDs of new replication servers and domains from one set (#1211)
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 09ab444..a67b651 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -2166,41 +2166,23 @@
notifyListeners(getFormattedWithPoints(INFO_PROGRESS_CONFIGURING_REPLICATION.get()));
InstallerHelper helper = new InstallerHelper();
- Set<Integer> knownReplicaServerIds = new HashSet<>();
- Set<Integer> knownReplicationServerIds = new HashSet<>();
+ final Set<Integer> knownServerIds;
if (lastLoadedCache != null)
{
- for (SuffixDescriptor suffix : lastLoadedCache.getSuffixes())
- {
- for (ReplicaDescriptor replica : suffix.getReplicas())
- {
- knownReplicaServerIds.add(replica.getServerId());
- }
- }
- for (ServerDescriptor server : lastLoadedCache.getServers())
- {
- Object v = server.getServerProperties().get(REPLICATION_SERVER_ID);
- if (v != null)
- {
- knownReplicationServerIds.add((Integer) v);
- }
- }
+ knownServerIds = InstallerHelper.getUsedServerIds(lastLoadedCache.getServers());
}
else
{
/* There is no ADS anywhere. Just use the SuffixDescriptors we found */
+ Set<ServerDescriptor> servers = new HashSet<>();
for (SuffixDescriptor suffix : getUserData().getSuffixesToReplicateOptions().getAvailableSuffixes())
{
for (ReplicaDescriptor replica : suffix.getReplicas())
{
- knownReplicaServerIds.add(replica.getServerId());
- Object v = replica.getServer().getServerProperties().get(REPLICATION_SERVER_ID);
- if (v != null)
- {
- knownReplicationServerIds.add((Integer) v);
- }
+ servers.add(replica.getServer());
}
}
+ knownServerIds = InstallerHelper.getUsedServerIds(servers);
}
/*
@@ -2258,8 +2240,7 @@
helper.configureReplication(conn, replicationServers,
getUserData().getReplicationOptions().getReplicationPort(),
getUserData().getReplicationOptions().useSecureReplication(),
- knownReplicationServerIds,
- knownReplicaServerIds);
+ knownServerIds);
localTimeMeasureTime = System.currentTimeMillis();
localTime = Utils.getServerClock(conn);
localServerDisplay = conn.getHostPort();
@@ -2353,8 +2334,7 @@
try (ConnectionWrapper conn = getRemoteConnection(server))
{
ConfiguredReplication repl = helper.configureReplication(
- conn, remoteReplicationServers, replicationPort, enableSecureReplication,
- knownReplicationServerIds, knownReplicaServerIds);
+ conn, remoteReplicationServers, replicationPort, enableSecureReplication, knownServerIds);
long remoteTimeMeasureTime = System.currentTimeMillis();
long remoteTime = Utils.getServerClock(conn);
if (localTime != -1
--
Gitblit v1.10.0