Merge pull request #332 from overture-stack/feature/increase-id-client-retry

added longer default retry for the id client

Author: andricDu

Diff for: song-server/src/main/java/bio/overture/song/server/config/IdConfig.java

@@ -17,8 +17,10 @@
 package bio.overture.song.server.config;
 
 import lombok.Data;
+import lombok.val;
 import org.icgc.dcc.id.client.core.IdClient;
 import org.icgc.dcc.id.client.http.HttpIdClient;
+import org.icgc.dcc.id.client.http.webclient.WebClientConfig;
 import org.icgc.dcc.id.client.util.HashIdClient;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -28,16 +30,31 @@
 @Data
 @ConfigurationProperties(prefix = "id")
 public class IdConfig {
+  private static final int DEFAULT_MAX_RETRIES = 10;
+  private static final float DEFAULT_MULTIPLIER = 2;
+  private static final int DEFAULT_INITIAL_BACKOFF_SECONDS = 2;
 
   private String idUrl;
   private String authToken;
   private boolean realIds;
   private boolean persistInMemory = false;
+  private int maxRetries = DEFAULT_MAX_RETRIES;
+  private float multiplier =  DEFAULT_MULTIPLIER;
+  private int initialBackoffSeconds = DEFAULT_INITIAL_BACKOFF_SECONDS;
 
   @Bean
   public IdClient createIdClient() {
+    val idClientConfig = WebClientConfig.builder()
+        .serviceUrl(idUrl)
+        .authToken(authToken)
+        .release("")
+        .maxRetries(maxRetries)
+        .retryMultiplier(multiplier)
+        .waitBeforeRetrySeconds(initialBackoffSeconds)
+        .build();
+
     // [SONG-167]: Temporarily removed cacheId client due to bug in DCC-ID-12: https://github.com/icgc-dcc/dcc-id/issues/12
-    return realIds ? new HttpIdClient(idUrl, "", authToken) : new HashIdClient(persistInMemory);
+    return realIds ? new HttpIdClient(idClientConfig) : new HashIdClient(persistInMemory);
 //    return realIds ? new CachingIdClient(new HttpIdClient(idUrl, "", authToken)) : new HashIdClient(persistInMemory);
   }
 

Diff for: song-server/src/main/resources/application.yml

@@ -55,6 +55,9 @@ id:
   authToken: "idToken"
   realIds: false
   persistInMemory: false
+  maxRetries: 10
+  multiplier: 2
+  initialBackoffSeconds: 2
 
 validation:
   delayMs: 30