Add embedded-mode options to bypass DB cache and fail fast on journal lock contention#10363
Merged
coffeegoddd merged 5 commits intomainfrom Jan 27, 2026
Merged
Add embedded-mode options to bypass DB cache and fail fast on journal lock contention#10363coffeegoddd merged 5 commits intomainfrom
coffeegoddd merged 5 commits intomainfrom
Conversation
Contributor
Author
|
@coffeegoddd DOLT
|
Contributor
Author
|
@coffeegoddd DOLT
|
reltuk
approved these changes
Jan 26, 2026
Contributor
reltuk
left a comment
reltuk
left a comment
There was a problem hiding this comment.
I took a pass. Just a couple suggestions for a helper method and improving the semantics of a changed function at one point.
Contributor
Author
|
@coffeegoddd DOLT
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR adds opt-in controls for embedded/driver use-cases that need deterministic reopen semantics under contention:
• Disable local singleton DB caching for file-backed databases via a new dbfactory param, so each open constructs a fresh store.
• Fail fast on journal manifest lock timeout via a new dbfactory param, returning a sentinel error instead of falling back to read-only.
• Plumb DB load parameters through the SQL engine / env so an embedded driver can thread these options into Dolt database creation.
Key changes
• dbfactory:
• Adds DisableSingletonCacheParam (disable_singleton_cache)
• Adds FailOnJournalLockTimeoutParam (fail_on_journal_lock_timeout)
• Bypasses the singleton cache in FileFactory.CreateDB when disable_singleton_cache is set.
• nbs:
• Adds ErrDatabaseLocked
• Adds JournalingStoreOptions + NewLocalJournalingStoreWithOptions
• Updates newJournalManifest(..., failOnTimeout) to return ErrDatabaseLocked on lock timeout when enabled.
• SQL engine / env plumbing:
• Adds DBLoadParams to engine.SqlEngineConfig and threads them into env.DoltEnv prior to DB loading.
• Adds DBLoadParams to env.DoltEnv and merges them into both DB load paths (LoadDoltDB and LoadDoltDBWithParams).
• Updates env.MultiEnvForDirectory to respect a caller-provided *DoltEnv to avoid preloading before params are set.