From 699920cb8958b4436cbb16d27616d30ca98ba59b Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Sun, 29 Aug 2021 11:38:19 +0200 Subject: [PATCH] Fixing timeout value and adding thread output to maven build --- Jenkinsfile | 4 ++-- .../repository/cassandra/DefaultCassandraArchivaManager.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 56dc1c6a6..3f937f01d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -106,7 +106,7 @@ pipeline { // -Dmaven.compiler.fork=true: Do compile in a separate forked process // -Dmaven.test.failure.ignore=true: Do not stop, if some tests fail // -Pci-build: Profile for CI-Server - sh "mvn ${cmdLine} -B -U -e -fae -Dmaven.compiler.fork=true -Pci-build -T${THREADS}" + sh "mvn ${cmdLine} -B -U -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Dmaven.compiler.fork=true -Pci-build -T${THREADS}" } } } @@ -149,7 +149,7 @@ pipeline { { sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh" sh "./src/ci/scripts/prepareWorkspace.sh" - sh "mvn clean install -U -B -e -fae -Dmaven.compiler.fork=true -Pci-build -T${THREADS}" + sh "mvn clean install -U -B -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Dmaven.compiler.fork=true -Pci-build -T${THREADS}" } } } diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java index 5b5da70e3..085f3e205 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java @@ -38,6 +38,7 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; +import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -185,7 +186,7 @@ public class DefaultCassandraArchivaManager .withInt( DefaultDriverOption.CONNECTION_POOL_REMOTE_SIZE, maxActive ) //.withInt( DefaultDriverOption.CONNECTION_MAX_REQUESTS, maxActive ) .withString( DefaultDriverOption.REQUEST_CONSISTENCY, readConsistencyLevel ) - .withInt( DefaultDriverOption.REQUEST_TIMEOUT, 10 ) + .withDuration( DefaultDriverOption.REQUEST_TIMEOUT, Duration.ofSeconds( 10 ) ) .build( ); { -- 2.39.5