[coordinator] Don't abort on deadlock when spliting, use random tie b…

…reakers group instead
VirtusLab · May 12, 2023 · 86e7f21 · 86e7f21
1 parent 2026365
commit 86e7f21
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/coordinator/src/main/scala/buildPlan.scala b/coordinator/src/main/scala/buildPlan.scala
@@ -285,7 +285,7 @@ def splitIntoStages(
         def hasCyclicDependencies(p: ProjectBuildDef) =
           p.dependencies.exists(deps(_).dependencies.contains(p.project))
         val cyclicDeps = newRemainings.filter(hasCyclicDependencies)
-        if cyclicDeps.nonEmpty then
+        if cyclicDeps.nonEmpty then {
           currentStage ++= cyclicDeps
           newRemainings --= cyclicDeps
           cyclicDeps.foreach(v =>
@@ -294,13 +294,21 @@ def splitIntoStages(
                 .filterNot(done.contains)}"
             )
           )
-        else
-          newRemainings.foreach { p =>
-            println(
-              s"${p.project.coordinates}: ${p.dependencies.map(_.coordinates).mkString(", ")}"
-            )
-          }
-          sys.error("Deadlock in splitting projects into stages")
+        } else {
+          System.err.println(
+            "Deadlock in splitting projects into stages, joining into single group"
+          )
+          newRemainings
+            .sortBy(_.project)
+            .foreach { p =>
+              println(
+                s"${p.project.coordinates}: ${p.dependencies.map(_.coordinates).mkString(", ")}"
+              )
+            }
+          val tieBreakers = newRemainings.take(25)
+          currentStage ++= tieBreakers
+          newRemainings --= tieBreakers
+        }
       }
       val names = currentStage.map(_.project)
       val currentStages = currentStage.grouped(maxStageSize).toList