From 61dac86bceb9d727e1bd707982c41ab9467c6d5a Mon Sep 17 00:00:00 2001
From: Maxim Thomas <maxim.thomas@gmail.com>
Date: Mon, 03 Nov 2025 06:30:05 +0000
Subject: [PATCH] Switch from sun.security.x509 to Bouncy Castle API (#560)
---
opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
index 50a6728..27e11d8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
@@ -17,7 +17,10 @@
*/
package org.opends.server.replication.service;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.TestCaseUtils.generateThreadDump;
import static org.opends.server.util.CollectionUtils.*;
import static org.testng.Assert.*;
@@ -28,6 +31,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.task.Task;
@@ -42,6 +46,7 @@
import org.opends.server.replication.service.ReplicationDomain.ImportExportContext;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
+import org.opends.server.util.TestTimer;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -302,8 +307,7 @@
new ReplServerFakeConfiguration(replicationPort, dirName, 0, serverId, 0, windowSize, replServers));
}
- private void disable(ReplicationDomain... domains)
- {
+ private void disable(ReplicationDomain... domains) throws InterruptedException {
for (ReplicationDomain domain : domains)
{
if (domain != null)
@@ -348,7 +352,7 @@
domain1 = new FakeReplicationDomain(
testService, serverId1, servers, 0, exportedData, null, ENTRYCOUNT);
- StringBuilder importedData = new StringBuilder();
+ StringBuffer importedData = new StringBuffer();
domain2 = new FakeReplicationDomain(
testService, serverId2, servers, 0, null, importedData, 0);
@@ -419,10 +423,27 @@
domain1 = new FakeReplicationDomain(
testService, 1, servers1, 0, exportedData, null, ENTRYCOUNT);
- StringBuilder importedData = new StringBuilder();
+ StringBuffer importedData = new StringBuffer();
domain2 = new FakeReplicationDomain(
testService, 2, servers2, 0, null, importedData, 0);
+
+ //wait for domains topology initialization
+ {
+ TestTimer timer = new TestTimer.Builder()
+ .maxSleep(30, SECONDS)
+ .sleepTimes(100, MILLISECONDS)
+ .toTimer();
+ final FakeReplicationDomain finalDomain1 = domain1;
+ final FakeReplicationDomain finalDomain2 = domain2;
+ timer.repeatUntilSuccess(() -> {
+ assertFalse(finalDomain1.getReplicaInfos().isEmpty());
+ assertEquals(2, finalDomain1.getRsInfos().size());
+ assertFalse(finalDomain2.getReplicaInfos().isEmpty());
+ assertEquals(2, finalDomain2.getRsInfos().size());
+ });
+ }
+
domain2.initializeFromRemote(1, NO_INIT_TASK);
waitEndExport(exportedData, importedData);
@@ -445,18 +466,22 @@
return sb.toString();
}
- private void waitEndExport(String exportedData, StringBuilder importedData) throws Exception
+ private void waitEndExport(String exportedData, StringBuffer importedData) throws Exception
{
int count = 0;
while (importedData.length() < exportedData.length() && count < 500*5)
{
+ if(count % 100 == 0) { //capture thread dump on start and every 10 seconds
+ logger.debug(LocalizableMessage.raw("waitEndExport: thread dump on count=" + count));
+ logger.debug(LocalizableMessage.raw(generateThreadDump()));
+ }
count ++;
Thread.sleep(100);
}
}
private void assertExportSucessful(ReplicationDomain domain1,
- ReplicationDomain domain2, String exportedData, StringBuilder importedData)
+ ReplicationDomain domain2, String exportedData, StringBuffer importedData)
{
assertEquals(getLeftEntryCount(domain2), 0, "Wrong LeftEntryCount for export");
assertEquals(getLeftEntryCount(domain1), 0, "Wrong LeftEntryCount for import");
--
Gitblit v1.10.0