From 059f6f87407477836e6e3927fa45384563a972f4 Mon Sep 17 00:00:00 2001 From: kochetkov Date: Tue, 10 Dec 2024 14:21:21 +0300 Subject: [PATCH 1/2] add default timeout --- config-data-executor/src/main/resources/application.yml | 4 ++++ .../src/main/resources/transactions.properties | 1 + 2 files changed, 5 insertions(+) diff --git a/config-data-executor/src/main/resources/application.yml b/config-data-executor/src/main/resources/application.yml index f800835..26b8855 100644 --- a/config-data-executor/src/main/resources/application.yml +++ b/config-data-executor/src/main/resources/application.yml @@ -1,4 +1,8 @@ configDirectory: C:\work\ervu-eks\config\cde-xml +spring: + mvc: + servlet: + load-on-startup: 1 logging: level: root: info diff --git a/config-data-executor/src/main/resources/transactions.properties b/config-data-executor/src/main/resources/transactions.properties index c1e6711..4378827 100644 --- a/config-data-executor/src/main/resources/transactions.properties +++ b/config-data-executor/src/main/resources/transactions.properties @@ -1 +1,2 @@ com.atomikos.icatch.max_timeout = 300000 +com.atomikos.icatch.default_jta_timeout=300000 From b97e8a6a2cc4b5c1dea10410a78b1aa647065ce3 Mon Sep 17 00:00:00 2001 From: kochetkov Date: Tue, 10 Dec 2024 14:22:31 +0300 Subject: [PATCH 2/2] remove timeout from sources --- .../src/main/java/org/micord/service/RequestService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-data-executor/src/main/java/org/micord/service/RequestService.java b/config-data-executor/src/main/java/org/micord/service/RequestService.java index 10e20f8..be88d57 100644 --- a/config-data-executor/src/main/java/org/micord/service/RequestService.java +++ b/config-data-executor/src/main/java/org/micord/service/RequestService.java @@ -137,7 +137,7 @@ public class RequestService { } } - @Transactional(timeout = 300000) + @Transactional public void processSqlAndAqlRequests(Requests config, List ids) { logger.debug("Starting transactional processing of requests"); if (config.getSqlRequests() != null) {