Add HTTP fetch retry

mapfish · Feb 23, 2023 · 3278b8b · 3278b8b
1 parent d0d67a3
commit 3278b8b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/checkstyle_checks.xml b/checkstyle_checks.xml
@@ -39,13 +39,6 @@
         <module name="IllegalImport"/>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
-        <module name="ImportOrder">
-            <property name="groups"
-                      value="/^ar\./,/^ch\./,/^com\./,/^io\./,/^net\./,/^org\./,/^si\./,/^java\./,/^javax\./"/>
-            <property name="option" value="bottom"/>
-            <property name="sortStaticImportsAlphabetically" value="true"/>
-            <property name="separated" value="true"/>
-        </module>
         <module name="MethodLength"/>
         <module name="ParameterNumber"/>
         <module name="EmptyForIteratorPad">

diff --git a/core/build.gradle b/core/build.gradle
@@ -127,10 +127,12 @@ dependencies {
             'org.postgresql:postgresql:42.5.2',
             'com.vladmihalcea:hibernate-types-52:2.21.1',
             'com.mchange:c3p0:0.9.5.5',
+            "org.springframework:spring-aspects:5.3.25",
             "org.springframework:spring-orm:5.3.25",
             "org.springframework:spring-jdbc:5.3.25",
             "org.springframework:spring-tx:5.3.25",
             "org.springframework:spring-test:5.3.25",
+            "org.springframework.retry:spring-retry:1.3.4",
     )
     metrics(
             "io.dropwizard.metrics:metrics-core:4.2.15",

diff --git a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
@@ -14,6 +14,8 @@
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.util.StreamUtils;
+import org.springframework.retry.annotation.Retryable;
+import org.springframework.retry.annotation.Backoff;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -191,6 +193,13 @@ public ClientHttpResponse execute() {
             return result;
         }
 
+        @Retryable(value = IOException.class, maxAttemptsExpression = "${httpfetch.retry.maxAttempts}",
+               backoff = @Backoff(delayExpression = "${httpfetch.retry.backoffDelay}"))
+        private ClientHttpResponse fetch() throws IOException {
+            ClientHttpResponse originalResponse = this.originalRequest.execute();
+            context.stopIfCanceled();
+            return new CachedClientHttpResponse(originalResponse);
+        }
         @Override
         public Void call() throws Exception {
             return context.mdcContextEx(() -> {
@@ -199,9 +208,8 @@ public Void call() throws Exception {
                                 StatsUtils.quotePart(getURI().getHost());
                 final Timer.Context timerDownload =
                         HttpRequestFetcher.this.registry.timer(baseMetricName).time();
-                try (ClientHttpResponse originalResponse = this.originalRequest.execute()) {
-                    context.stopIfCanceled();
-                    this.response = new CachedClientHttpResponse(originalResponse);
+                try {
+                    this.response = this.fetch();
                 } catch (IOException e) {
                     LOGGER.error("Request failed {}", this.originalRequest.getURI(), e);
                     this.response = new AbstractClientHttpResponse() {

diff --git a/core/src/main/resources/mapfish-spring.properties b/core/src/main/resources/mapfish-spring.properties
@@ -46,3 +46,7 @@ db.schema=public
 
 # The default print-apps location
 printapps.location=servlet:///print-apps
+
+# Configure the retry mechanism for HTTP requests
+httpfetch.retry.maxAttempts=2
+httpfetch.retry.backoffDelay=100