Merge pull request #66 from eed3si9n/wip/retry

Retry 5 times
twitter · Apr 2, 2021 · 214df1e · 214df1e
2 parents c81a04f + abb9d06
commit 214df1e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/multiversion/src/main/scala/multiversion/commands/ExportCommand.scala b/multiversion/src/main/scala/multiversion/commands/ExportCommand.scala
@@ -55,7 +55,7 @@ case class ExportCommand(
     lintCommand: LintCommand = LintCommand(),
     @Description("Retry limit when fetching a file.")
     @ParseAsNumber
-    retryCount: Int = 2,
+    retryCount: Int = 5,
     @Description("Number of parallel resolves and downloads.")
     @ParseAsNumber
     parallel: Int = 4,
@@ -401,7 +401,8 @@ case class ExportCommand(
       dep,
       cache,
       progressBar,
-      cdep
+      cdep,
+      retryCount
     )
 
     for {

diff --git a/multiversion/src/main/scala/multiversion/configs/ThirdpartyConfig.scala b/multiversion/src/main/scala/multiversion/configs/ThirdpartyConfig.scala
@@ -10,6 +10,7 @@ import coursier.cache.FileCache
 import coursier.core.Dependency
 import coursier.core.Module
 import coursier.core.Reconciliation
+import coursier.core.Resolution
 import coursier.params.ResolutionParams
 import coursier.util.ModuleMatchers
 import coursier.util.Task
@@ -98,7 +99,8 @@ final case class ThirdpartyConfig(
       dep: DependencyConfig,
       cache: FileCache[Task],
       progressBar: ResolveProgressRenderer,
-      cdep: Dependency
+      cdep: Dependency,
+      retryCount: Int
   ): Result[Task[Result[DependencyResolution]]] =
     Result.fromResults(decodeForceVersions(dep)).map { decodedForceVersions =>
       val allDependencies = for {
@@ -116,7 +118,20 @@ final case class ThirdpartyConfig(
           .withRepositories(
             if (repos.isEmpty) Resolve.defaultRepositories else repos
           )
-      resolve.io.map(r => DependencyResolution(dep, r)).toResult
+
+      def retry(m: Int) =
+        Task.tailRecM[Int, Resolution](m) { (n: Int) =>
+          if (n <= 0) resolve.io.map(Right(_))
+          else
+            resolve.io.attempt map {
+              case Right(r) => Right(r)
+              case Left(e) if e.getMessage.contains("concurrent download") =>
+                Thread.sleep(100)
+                Left(n - 1)
+              case Left(e) => throw e
+            }
+        }
+      retry(retryCount).map(r => DependencyResolution(dep, r)).toResult
     }
 
   private type ForceVersionResult =