Fix embedded DB lock contention by closing nocache DoltDBs and plumbing DBLoadParams through CREATE DATABASE / clone / stats#10375
Merged
coffeegoddd merged 2 commits intomainfrom Jan 27, 2026
Merged
Conversation
Contributor
Author
|
@coffeegoddd DOLT
|
reltuk
approved these changes
Jan 27, 2026
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
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.
Summary
This change fixes an embedded / driver reopen failure where a two-phase flow (CREATE DATABASE then later Ping) could still
hit the database is locked by another dolt process even with disable_singleton_cache + fail-fast lock behavior enabled.
Key updates:
• Close underlying DoltDBs in nocache mode: sqle.DoltDatabaseProvider.Close() now closes all underlying *doltdb.DoltDB
instances when DisableSingletonCacheParam is in effect, ensuring .dolt/noms/LOCK is released on engine shutdown.
• Plumb DBLoadParams into provider-managed DB creation paths:
• CREATE DATABASE / UNDROP DATABASE now use env.LoadWithoutDB so DBLoadParams can be applied before any DB is opened.
• dolt_clone applies provider DBLoadParams to the clone env before registration.
• registerNewDatabase defensively applies provider DBLoadParams to the env.
• Propagate DBLoadParams into stats backing store: statspro now uses LoadWithoutDB for new stats storage and copies
DBLoadParams from the host env so embedded-mode settings apply consistently.
• Regression coverage: adds a test that creates a DB via the SQL engine, closes the engine, and asserts the LOCK is
released.
Why
Embedded callers rely on deterministic reopen semantics under contention. Previously, the SQL provider close path didn’t
close the underlying *doltdb.DoltDB for newly created DBs in nocache mode, leaving the journal manifest LOCK held and
causing retries / reopens to fail.