From 53bb3d5baf4b63ce5bde7eee67e7cb2a9173121a Mon Sep 17 00:00:00 2001 From: eh552t Date: Thu, 14 Sep 2017 11:14:02 +0200 Subject: [PATCH] Wait for database with mariadb connector With the change from Mysql to MariaDB connector maxReconnect parameter doesn't work anymore. We then need to use retriesAllDown instead but this is doing retries as fast as possible with no wait between tries so need an arbitrary high value. With maxReconnect it was waiting a time exponentially growing so a low value was enough. Change-Id: Id1429759aa4bdcfc9af1934fd6f8b848ed879e91 Signed-off-by: eh552t Issue-ID: CLAMP-42 --- extra/docker/clamp/clamp.env | 2 +- src/main/resources/application.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/docker/clamp/clamp.env b/extra/docker/clamp/clamp.env index d9ced6f3..e5936e35 100644 --- a/extra/docker/clamp/clamp.env +++ b/extra/docker/clamp/clamp.env @@ -1 +1 @@ -SPRING_APPLICATION_JSON={"spring.datasource.camunda.url":"jdbc:mariadb://db:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100","spring.datasource.cldsdb.url":"jdbc:mariadb://db:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100"} \ No newline at end of file +SPRING_APPLICATION_JSON={"spring.datasource.camunda.url":"jdbc:mariadb:sequential://db:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647","spring.datasource.cldsdb.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647"} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 78ab0c6c..42aad2d7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -94,7 +94,7 @@ kubernetes.namespace=com-att-ajsc #server.port=0 #Camunda Process Engine DataSource connection Details spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver -spring.datasource.camunda.url=jdbc:mariadb://localhost:${docker.mariadb.port.host}/camundabpm?autoReconnect=true +spring.datasource.camunda.url=jdbc:mariadb://localhost:${docker.mariadb.port.host}/camundabpm?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647 spring.datasource.camunda.username=camunda spring.datasource.camunda.password=ndMSpw4CAM spring.datasource.camunda.validationQuery=SELECT 1 @@ -115,7 +115,7 @@ camunda.bpm.database.schema-update=false #clds datasource connection details spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver -spring.datasource.cldsdb.url=jdbc:mariadb://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true +spring.datasource.cldsdb.url=jdbc:mariadb://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647 spring.datasource.cldsdb.username=clds spring.datasource.cldsdb.password=sidnnd83K spring.datasource.cldsdb.validationQuery=SELECT 1 -- 2.16.6