Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retry visualization evaluation #1958

Merged
merged 2 commits into from
Aug 17, 2021
Merged

Retry visualization evaluation #1958

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daa4fa2
feat: retry visualization evaluation
4e6 Aug 17, 2021
3815a29
misc: [no-changelog]
4e6 Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 63 additions & 19 deletions ...e/runtime/src/main/scala/org/enso/interpreter/instrument/job/UpsertVisualisationJob.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ import org.enso.interpreter.instrument.execution.{Executable, RuntimeContext}
import org.enso.interpreter.instrument.job.UpsertVisualisationJob.{
EvalFailure,
EvaluationFailed,
MaxEvaluationRetryCount,
ModuleNotFound
}
import org.enso.interpreter.runtime.Module
import org.enso.interpreter.runtime.control.ThreadInterruptedException
import org.enso.polyglot.runtime.Runtime.Api.{
ExpressionId,
RequestId,
Expand Down Expand Up @@ -126,45 +129,86 @@ class UpsertVisualisationJob(
)
}

private def evaluateExpression(
moduleName: String,
expression: String
)(implicit ctx: RuntimeContext): Either[EvalFailure, AnyRef] = {
private def findModule(
moduleName: String
)(implicit ctx: RuntimeContext): Either[EvalFailure, Module] = {
val context = ctx.executionService.getContext
// TODO [RW] more specific error when the module cannot be installed (#1861)
context.ensureModuleIsLoaded(moduleName)
val maybeModule = context.findModule(moduleName)

val notFoundOrModule =
if (maybeModule.isPresent) Right(maybeModule.get())
else Left(ModuleNotFound)
if (maybeModule.isPresent) Right(maybeModule.get())
else Left(ModuleNotFound)
}

private def evaluateModuleExpression(
module: Module,
expression: String,
retryCount: Int = 0
)(implicit
ctx: RuntimeContext
): Either[EvalFailure, AnyRef] =
Either
.catchNonFatal {
ctx.executionService.evaluateExpression(module, expression)
}
.leftFlatMap {
case _: ThreadInterruptedException
if retryCount < MaxEvaluationRetryCount =>
ctx.executionService.getLogger.log(
Level.WARNING,
s"Evaluation of visualisation was interrupted. Retrying [${retryCount + 1}]."
)
evaluateModuleExpression(module, expression, retryCount + 1)

notFoundOrModule.flatMap { module =>
Either
.catchNonFatal {
ctx.executionService.evaluateExpression(module, expression)
}
.leftMap { error =>
case error: ThreadInterruptedException =>
val message =
s"Evaluation of visualization failed after [$retryCount] times " +
s"[${error.getClass.getSimpleName}]."
ctx.executionService.getLogger
.log(
Level.SEVERE,
message
)
Left(
EvaluationFailed(
message,
ProgramExecutionSupport.getDiagnosticOutcome.lift(error)
)
)

case error =>
ctx.executionService.getLogger
.log(
Level.SEVERE,
"Evaluation of visualization failed: " +
s"[${error.getClass}] ${error.getMessage}",
error
)
EvaluationFailed(
Option(error.getMessage).getOrElse(error.getClass.getSimpleName),
ProgramExecutionSupport.getDiagnosticOutcome.lift(error)
Left(
EvaluationFailed(
Option(error.getMessage).getOrElse(error.getClass.getSimpleName),
ProgramExecutionSupport.getDiagnosticOutcome.lift(error)
)
)
}
}
}

}
private def evaluateExpression(
moduleName: String,
expression: String
)(implicit ctx: RuntimeContext): Either[EvalFailure, AnyRef] =
for {
module <- findModule(moduleName)
expression <- evaluateModuleExpression(module, expression)
} yield expression

}

object UpsertVisualisationJob {

/** The number of times to retry the expression evaluation. */
val MaxEvaluationRetryCount: Int = 5

/** Base trait for evaluation failures.
*/
sealed trait EvalFailure
Expand Down