This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3fb34e825a27b26e5c6a5b39cabaa55864a1ce78 Author: Benoit Tellier <[email protected]> AuthorDate: Wed Feb 13 15:27:50 2019 +0700 JAMES-2630 Do not perform exponential retries upon connection recovery --- .../org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java | 3 ++- .../org/apache/james/modules/mailbox/ResilientClusterProvider.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java index b50f0f6..c838516 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java @@ -139,8 +139,9 @@ public class ElasticSearchMailboxModule extends AbstractModule { ElasticSearchMailboxConfiguration mailboxConfiguration, ElasticSearchQuotaConfiguration quotaConfiguration) { + Duration waitDelay = Duration.ofMillis(configuration.getMinDelay()); return Mono.fromCallable(() -> connectToCluster(configuration, mailboxConfiguration, quotaConfiguration)) - .retryBackoff(configuration.getMaxRetries(), Duration.ofMillis(configuration.getMinDelay())) + .retryBackoff(configuration.getMaxRetries(), waitDelay, waitDelay) .publishOn(Schedulers.elastic()) .block(); } diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java index f514675..06bfb9b 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ResilientClusterProvider.java @@ -48,8 +48,9 @@ public class ResilientClusterProvider implements Provider<Cluster> { @Inject private ResilientClusterProvider(ClusterConfiguration configuration) { + Duration waitDelay = Duration.ofMillis(configuration.getMinDelay()); cluster = Mono.fromCallable(getClusterRetryCallable(configuration)) - .retryBackoff(configuration.getMaxRetry(), Duration.ofMillis(configuration.getMinDelay())) + .retryBackoff(configuration.getMaxRetry(), waitDelay, waitDelay) .publishOn(Schedulers.elastic()) .block(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
