Skip to content

Commit 555950d

Browse files
authored
Extend the timeout for matrix jobs to allow for cascading (#764)
1 parent ddf0c1d commit 555950d

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

app/src/App/Server/JobExecutor.purs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,11 @@ findNextAvailableJob = runMaybeT
119119

120120
jobTimeout :: Job -> Duration.Minutes
121121
jobTimeout = case _ of
122+
MatrixJob _ -> Duration.Minutes 60.0
122123
PackageSetJob _ -> Duration.Minutes 90.0
123124
PublishJob _ -> Duration.Minutes 10.0
124-
_ -> Duration.Minutes 5.0
125+
TransferJob _ -> Duration.Minutes 10.0
126+
UnpublishJob _ -> Duration.Minutes 10.0
125127

126128
executeJob :: DateTime -> Job -> Run ServerEffects Unit
127129
executeJob _ = case _ of
@@ -195,7 +197,7 @@ upgradeRegistryToNewCompiler newCompilerVersion = do
195197
-- as they complete new jobs for their dependants will be queued up.
196198
when (Map.isEmpty manifest.dependencies) do
197199
Log.info $ Array.fold
198-
[ "Enqueuing matrix job for _new_ compiler "
200+
[ "Enqueuing matrix job for new compiler "
199201
, Version.print newCompilerVersion
200202
, ", package "
201203
, PackageName.print manifest.name

app/src/App/Server/MatrixBuilder.purs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@ solveForAllCompilers { compilerIndex, name, version, compiler, dependencies } =
188188
Log.debug $ "Trying compiler " <> Version.print target <> " for package " <> PackageName.print name
189189
case Solver.solveWithCompiler (Range.exact target) compilerIndex dependencies of
190190
Left _solverErrors -> do
191-
Log.info $ "Failed to solve with compiler " <> Version.print target
192-
-- Log.debug $ Solver.printSolverError solverErrors
191+
Log.info $ "Failed to solve with compiler " <> Version.print target <> ": " <> PackageName.print name <> "@" <> Version.print version
193192
pure Nothing
194193
Right (Tuple solvedCompiler resolutions) -> case solvedCompiler == target of
195194
true -> do
@@ -234,12 +233,11 @@ solveDependantsForCompiler { compilerIndex, name, version, compiler } = do
234233
Log.debug $ "Trying compiler " <> Version.print compiler <> " for package " <> PackageName.print manifest.name
235234
case Solver.solveWithCompiler (Range.exact compiler) compilerIndex manifest.dependencies of
236235
Left _solverErrors -> do
237-
Log.info $ "Failed to solve with compiler " <> Version.print compiler
238-
-- Log.debug $ Solver.printSolverError solverErrors
236+
Log.info $ "Failed to solve with compiler " <> Version.print compiler <> ": " <> PackageName.print manifest.name <> "@" <> Version.print manifest.version
239237
pure Nothing
240238
Right (Tuple solvedCompiler resolutions) -> case compiler == solvedCompiler of
241239
true -> do
242-
Log.debug $ "Solved with compiler " <> Version.print solvedCompiler
240+
Log.debug $ "Solved " <> PackageName.print manifest.name <> "@" <> Version.print manifest.version <> " with compiler " <> Version.print solvedCompiler
243241
pure $ Just { compiler, resolutions, name: manifest.name, version: manifest.version }
244242
false -> do
245243
Log.debug $ Array.fold

0 commit comments

Comments
 (0)