diff --git a/pom.xml b/pom.xml
index fb80fca2..0751b441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,8 @@
org.gridsuite.voltageinit.server
gridsuite
org.gridsuite:voltage-init-server
+
+ 2.0.0
@@ -182,6 +184,8 @@
org.gridsuite
gridsuite-computation
+
+ ${gridsuite-computation.version}
com.powsybl
diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java
index 0dad3a44..a4a792ce 100644
--- a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java
+++ b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitWorkerService.java
@@ -117,8 +117,12 @@ private UUID createModificationGroup(OpenReacResult openReacResult, Network netw
}
@Bean
- @Override
- public Consumer> consumeRun() {
+ public Consumer> consumeRun1() {
+ return super.consumeRun();
+ }
+
+ @Bean
+ public Consumer> consumeRun2() {
return super.consumeRun();
}
diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml
index e3810989..48d103e6 100644
--- a/src/main/resources/config/application.yaml
+++ b/src/main/resources/config/application.yaml
@@ -4,15 +4,16 @@ spring:
cloud:
function:
- definition: consumeRun;consumeCancel
+ definition: consumeRun1;consumeRun2;consumeCancel
stream:
bindings:
- consumeRun-in-0:
+ consumeRun1-in-0: &consumerRunConfig
destination: ${powsybl-ws.rabbitmq.destination.prefix:}voltageinit.run
group: voltageinitGroup
consumer:
- concurrency: 2
max-attempts: 1
+ consumeRun2-in-0:
+ <<: *consumerRunConfig
publishRun-out-0:
destination: ${powsybl-ws.rabbitmq.destination.prefix:}voltageinit.run
publishDebug-out-0:
@@ -30,7 +31,7 @@ spring:
output-bindings: publishRun-out-0;publishDebug-out-0;publishResult-out-0;publishCancel-out-0;publishStopped-out-0;publishCancelFailed-out-0
rabbit:
bindings:
- consumeRun-in-0:
+ consumeRun1-in-0: &consumeRunRabbitConfig
consumer:
auto-bind-dlq: true
dead-letter-exchange: ${powsybl-ws.rabbitmq.destination.prefix:}voltageinit.run.dlx
@@ -39,8 +40,13 @@ spring:
quorum:
enabled: true
delivery-limit: 2
+ consumeRun2-in-0:
+ <<: *consumeRunRabbitConfig
computation:
+ rabbit:
+ loadbalanced-group:
+ - voltageinitGroup
s3:
enabled: true
diff --git a/src/test/resources/application-default.yml b/src/test/resources/application-default.yml
index af16ae08..e107a1a2 100644
--- a/src/test/resources/application-default.yml
+++ b/src/test/resources/application-default.yml
@@ -8,7 +8,10 @@ spring:
hibernate:
#to turn off schema validation that fails (because of clob types) and blocks tests even if the the schema is compatible
ddl-auto: none
-
+ cloud:
+ function:
+ # disable consumeRun2 during test - all of them receive the "voltageinitGroup" messages otherwise
+ definition: consumeRun1;consumeCancel
logging:
level:
org.springframework.orm.jpa: INFO