Define and enforce locking order during runtime #8014
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JaroslavTulach
added
CI: No changelog needed
JaroslavTulach
requested review from
4e6,
hubertp and
Akirathan
as code owners
JaroslavTulach
commented
Oct 10, 2023
| logger.log(Level.SEVERE, msg, ex) | ||
| } catch { | ||
| case ise: IllegalStateException => | ||
| // Thread using TruffleLogger has to have a current context or the TruffleLogger has to be bound to an engine |
There was a problem hiding this comment.
To simulate the problem:
enso$ git diff
diff --git engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/ReentrantLocking.scala engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/ReentrantLocking.scala
index 8cb4b0b5c4..0b84019fd0 100644
--- engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/ReentrantLocking.scala
+++ engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/ReentrantLocking.scala
@@ -153,6 +153,8 @@ class ReentrantLocking(logger: TruffleLogger) extends Locking {
/** @inheritdoc */
override def acquireFileLock(file: File): Long = {
+ assertNotLocked(compilationLock, false, "wrong")
+ assertNotLocked(compilationLock, true, "wrong")
// cannot have pendings lock as of EnsureCompiledJob.applyEdits
assertNotLocked(
pendingEditsLock,
$ sbt runtime-with-instruments/testand one gets:
java.lang.IllegalStateException: Thread using TruffleLogger has to have a current context or the TruffleLogger has to be bound to an engine., took 0.025 sec
[error] at com.oracle.truffle.api.TruffleLogger$LoggerCache.noContext(TruffleLogger.java:1011)
[error] at com.oracle.truffle.api.TruffleLogger$LoggerCache.isLoggable(TruffleLogger.java:993)
[error] at com.oracle.truffle.api.TruffleLogger.isLoggableSlowPath(TruffleLogger.java:727)
[error] at com.oracle.truffle.api.TruffleLogger.isLoggable(TruffleLogger.java:722)
[error] at com.oracle.truffle.api.TruffleLogger.log(TruffleLogger.java:544)
[error] at org.enso.interpreter.instrument.command.SynchronousCommand.execute(SynchronousCommand.scala:30)
[error] at org.enso.interpreter.instrument.command.SynchronousCommand.execute(SynchronousCommand.scala:11)
[error] at org.enso.interpreter.instrument.execution.CommandExecutionEngine.invoke(CommandExecutionEngine.scala:63)
[error] at org.enso.interpreter.instrument.Handler.onMessage(Handler.scala:128)
[error] at org.enso.interpreter.instrument.Endpoint.$anonfun$sendBinary$1(Handler.scala:66)
[error] at org.enso.interpreter.instrument.Endpoint.$anonfun$sendBinary$1$adapted(Handler.scala:64)
[error] at scala.Option.foreach(Option.scala:437)
[error] at org.enso.interpreter.instrument.Endpoint.sendBinary(Handler.scala:64)
[error] at com.oracle.truffle.api.instrumentation.TruffleInstrument$Env$MessageTransportProxy$MessageEndpointProxy.sendBinary(TruffleInstrument.java:1090)
[error] at org.enso.interpreter.test.instrument.RuntimeServerEmulator.sendToRuntime(RuntimeServerEmulator.scala:53)
[error] at org.enso.interpreter.test.instrument.RuntimeServerTest$TestContext.send(RuntimeServerTest.scala:94)
[error] at org.enso.interpreter.test.instrument.IncrementalUpdatesTest.sendUpdatesWhenFunctionBodyIsChanged(IncrementalUpdatesTest.java:202)
[error] at org.enso.interpreter.test.instrument.IncrementalUpdatesTest.sendUpdatesWhenFunctionBodyIsChangedBySettingValue(IncrementalUpdatesTest.java:150)
[error] at org.enso.interpreter.test.instrument.IncrementalUpdatesTest.sendUpdatesWhenTextIsChangedBySettingValue(IncrementalUpdatesTest.java:105)
maybe we should be using normal logger and not Truffle logger here?
There was a problem hiding this comment.
This remains an open question, @hubertp: Shall we use regular, non-truffle logger here?
There was a problem hiding this comment.
Yes, very much so #8147 (better to file a separate ticket or the problem will get lost).
JaroslavTulach
changed the title
hubertp
approved these changes
Oct 11, 2023
JaroslavTulach
deleted the
wip/jtulach/EnsureLockOrderingDuringRuntime_7898
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Description
There are many locks in
Lockingtrait. We need to define their ordering if we want to provably avoid deadlocks among them. Adding such ordering and runtime checks to make sure it is obeyed.Important Notes
According to deadlock avoidance theory, ordering of locks avoids deadlocks as it prevents (random) incremental requests.
Checklist
Please ensure that the following checklist has been satisfied before submitting the PR:
Scala,