JAMES-1999 Increase init waiting time for each retrying times

apache · May 24, 2017 · 58f0e72 · 58f0e72
1 parent ed06af0
commit 58f0e72
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/...assandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java b/...assandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java
@@ -19,6 +19,7 @@
 package org.apache.james.modules.mailbox;
 
 import java.io.FileNotFoundException;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -115,7 +116,7 @@ Cluster provideCluster(CassandraSessionConfiguration cassandraSessionConfigurati
     }
 
     private RetryCallable<Cluster> getClusterRetryCallable(PropertiesConfiguration configuration, List<Host> servers, QueryLoggerConfiguration queryLoggerConfiguration) {
-        LOGGER.info("Trying to connect to Cassandra service");
+        LOGGER.info("Trying to connect to Cassandra service at {}", LocalDateTime.now());
 
         return context -> ClusterWithKeyspaceCreatedFactory
             .config(ClusterBuilder.builder()

diff --git a/...ndra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java b/...ndra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java
@@ -20,6 +20,7 @@
 package org.apache.james.modules.mailbox;
 
 import java.io.FileNotFoundException;
+import java.time.LocalDateTime;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
@@ -104,7 +105,7 @@ private Client createIndexAndMapping(Client client, PropertiesConfiguration prop
     }
 
     private Client connectToCluster(PropertiesConfiguration propertiesReader) throws ConfigurationException {
-        LOGGER.info("Trying to connect to ElasticSearch service");
+        LOGGER.info("Trying to connect to ElasticSearch service at {}", LocalDateTime.now());
 
         return createIndexAndMapping(createClient(propertiesReader), propertiesReader);
     }

diff --git a/...r/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java b/...r/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
@@ -47,7 +47,7 @@ public PropertiesConfiguration getCassandraConfigurationForDocker() {
         configuration.addProperty("cassandra.nodes", getIp() + ":" + CASSANDRA_PORT);
         configuration.addProperty("cassandra.keyspace", "apache_james");
         configuration.addProperty("cassandra.replication.factor", 1);
-        configuration.addProperty("cassandra.retryConnection.maxRetries", 10);
+        configuration.addProperty("cassandra.retryConnection.maxRetries", 20);
         configuration.addProperty("cassandra.retryConnection.minDelay", 5000);
 
         return configuration;

diff --git a/...ntainer/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java b/...ntainer/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
@@ -51,7 +51,7 @@ public PropertiesConfiguration getElasticSearchConfigurationForDocker() {
         configuration.addProperty("elasticsearch.nb.shards", 1);
         configuration.addProperty("elasticsearch.nb.replica", 0);
         configuration.addProperty("elasticsearch.retryConnection.maxRetries", 7);
-        configuration.addProperty("elasticsearch.retryConnection.minDelay", 30);
+        configuration.addProperty("elasticsearch.retryConnection.minDelay", 3000);
         configuration.addProperty("elasticsearch.indexAttachments", false);
         configuration.addProperty("elasticsearch.http.host", getIp());
         configuration.addProperty("elasticsearch.http.port", ELASTIC_SEARCH_HTTP_PORT);

diff --git a/.../container/guice/guice-common/src/main/java/org/apache/james/utils/RetryExecutorUtil.java b/.../container/guice/guice-common/src/main/java/org/apache/james/utils/RetryExecutorUtil.java
@@ -20,17 +20,21 @@
 package org.apache.james.utils;
 
 import com.nurkiewicz.asyncretry.AsyncRetryExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RetryExecutorUtil {
+    private static final Logger LOG = LoggerFactory.getLogger(RetryExecutorUtil.class);
 
-    public static final int INITIAL_DELAY_MILLIS = 500;
-    public static final int MULTIPLIER = 2;
+    private static final int INITIAL_DELAY_MILLIS = 500;
+    private static final int MULTIPLIER = 2;
 
-    public static AsyncRetryExecutor retryOnExceptions(AsyncRetryExecutor executor, int maxRetries, int minDelay, Class<? extends Throwable> clazz) {
+    public static AsyncRetryExecutor retryOnExceptions(AsyncRetryExecutor executor, int maxRetries, int minDelay, Class<? extends Throwable>... clazz) {
+        LOG.info("The action should retry when {} and retry to {} times if needed", clazz, maxRetries);
         return executor
-            .retryOn(clazz)
             .withExponentialBackoff(INITIAL_DELAY_MILLIS, MULTIPLIER)
             .withProportionalJitter()
+            .retryOn(clazz)
             .withMaxRetries(maxRetries)
             .withMinDelay(minDelay);
     }