From 480b2b2bd2a971f677fe3810743c5bc86cab0b28 Mon Sep 17 00:00:00 2001 From: kaah Date: Wed, 20 May 2026 09:27:47 +0200 Subject: [PATCH 1/2] noIdentifyGetFilePerformant doesn't produce the files in the resources directory anymore. --- bitrepository-reference-pillar/pom.xml | 19 ++++++++ .../integration/perf/GetFileStressIT.java | 46 +++++++++---------- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/bitrepository-reference-pillar/pom.xml b/bitrepository-reference-pillar/pom.xml index 5dfd1009f..2ad9aa622 100644 --- a/bitrepository-reference-pillar/pom.xml +++ b/bitrepository-reference-pillar/pom.xml @@ -37,6 +37,18 @@ test-jar test + + org.eclipse.jetty + jetty-server + 12.0.19 + test + + + org.eclipse.jetty + jetty-servlet + 11.0.20 + test + ${project.groupId} bitrepository-client @@ -56,6 +68,13 @@ ${activemq.version} test + + org.eclipse.jetty + jetty-server + 9.4.51.v20230217 + test + + diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/GetFileStressIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/GetFileStressIT.java index 58747b4b7..224a2b5fa 100644 --- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/GetFileStressIT.java +++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/GetFileStressIT.java @@ -32,22 +32,21 @@ import org.bitrepository.pillar.integration.perf.metrics.Metrics; import org.bitrepository.pillar.messagefactories.GetFileMessageFactory; import org.bitrepository.protocol.bus.MessageReceiver; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; -import java.io.IOException; -import java.nio.file.DirectoryStream; +import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import static org.bitrepository.common.utils.AllureTestUtils.addDescription; import static org.bitrepository.common.utils.AllureTestUtils.addStep; -public class GetFileStressIT extends PillarPerformanceTest { - public static final String FOLDER_NAME = "src/test/resources"; +class GetFileStressIT extends PillarPerformanceTest { + @TempDir + static Path tempDir; protected GetFileClient getFileClient; @BeforeEach @@ -57,22 +56,6 @@ settingsForTestClient, createSecurityManager(), settingsForTestClient.getCompone ); } - @AfterAll - static void removeUnnecessaryFiles() throws IOException { - removeFiles("noIdentfy", FOLDER_NAME); - removeFiles("parallel", FOLDER_NAME); - removeFiles("single", FOLDER_NAME); - } - - private static void removeFiles(String fileStartsWith, String folderName) throws IOException { - Path directory = Paths.get(folderName); - try (DirectoryStream stream = Files.newDirectoryStream(directory, fileStartsWith + "*")) { - for (Path entry : stream) { - Files.delete(entry); - } - } - } - @Test @Tag("pillar-stress-test") void singleGetFilePerformanceTest() throws Exception { @@ -112,6 +95,7 @@ void parallelGetFilePerformanceTest() throws Exception { EventHandler eventHandler = new OperationEventHandlerForMetrics(metrics, getLimiter); for (int i = 1; i <= numberOfFiles; i++) { getLimiter.addJob(defaultFileId); + URL testUrl = httpServerConfiguration.getURL(nonDefaultFileId + "-" + i); getFileClient.getFileFromSpecificPillar( collectionID, defaultFileId, null, httpServerConfiguration.getURL(nonDefaultFileId + "-" + i), getPillarID(), eventHandler, " performing parallelGetFilePerformance"); @@ -142,11 +126,23 @@ void noIdentfyGetFilePerformanceTest() throws Exception { for (int i = 1; i <= numberOfFiles; i++) { String correlationID = msgFactory.getNewCorrelationID(); getLimiter.addJob(correlationID); + String fileName = nonDefaultFileId + "-" + i; + + // Ensure the source file exists in the temp directory so the server can serve it + Path sourceFile = tempDir.resolve(fileName); + if (!Files.exists(sourceFile)) { + Files.createFile(sourceFile); + } + + // Create a unique destination path for each file within the temp directory + Path destinationFile = tempDir.resolve("noIdentfy-dest-" + i); GetFileRequest getRequest = - msgFactory.createGetFileRequest("noIdentfyGetFilePerformanceTest", correlationID, - httpServerConfiguration.getURL(nonDefaultFileId + "-" + i).toExternalForm(), + msgFactory.createGetFileRequest(destinationFile.toAbsolutePath().toString(), + correlationID, + httpServerConfiguration.getURL(fileName).toExternalForm(), defaultFileId, null, getPillarID(), getPillarID(), settingsForTestClient.getReceiverDestinationID(), pillarDestination); + getRequest.setFileAddress("file:" + tempDir.toAbsolutePath().toString()+"/"+fileName); messageBus.sendMessage(getRequest); } @@ -165,4 +161,4 @@ public String lookupGetFileDestination() { messageBus.removeListener(clientReceiver.getDestination(), clientReceiver.getMessageListener()); return pillarDestination; } -} \ No newline at end of file +} From 1529f4da84f73280bb383abedda02a6ac157f12a Mon Sep 17 00:00:00 2001 From: kaah Date: Thu, 13 Aug 2026 11:49:51 +0200 Subject: [PATCH 2/2] Made minor corrections after merging with master. --- bitrepository-reference-pillar/pom.xml | 19 ------------------- .../integration/perf/GetFileStressIT.java | 9 +++------ 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/bitrepository-reference-pillar/pom.xml b/bitrepository-reference-pillar/pom.xml index 2f06fadb6..3548c4330 100644 --- a/bitrepository-reference-pillar/pom.xml +++ b/bitrepository-reference-pillar/pom.xml @@ -37,18 +37,6 @@ test-jar test - - org.eclipse.jetty - jetty-server - 12.0.19 - test - - - org.eclipse.jetty - jetty-servlet - 11.0.20 - test - ${project.groupId} bitrepository-client @@ -82,13 +70,6 @@ testcontainers-postgresql test - - org.eclipse.jetty - jetty-server - 9.4.51.v20230217 - test - - diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/GetFileStressIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/GetFileStressIT.java index 940d7de69..1de71090d 100644 --- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/GetFileStressIT.java +++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/GetFileStressIT.java @@ -33,25 +33,22 @@ import org.bitrepository.pillar.integration.perf.metrics.Metrics; import org.bitrepository.pillar.messagefactories.GetFileMessageFactory; import org.bitrepository.protocol.bus.MessageReceiver; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIf; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.io.TempDir; -import java.io.IOException; -import java.nio.file.DirectoryStream; +import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import static org.bitrepository.common.utils.AllureTestUtils.addDescription; import static org.bitrepository.common.utils.AllureTestUtils.addStep; @EnabledIfSystemProperty(named = "runStressTests", matches = "true") public class GetFileStressIT extends PillarPerformanceIT { - public static final String FOLDER_NAME = "src/test/resources"; + @TempDir static Path tempDir; protected GetFileClient getFileClient;