/go/{cmd,libraries} check for valid dbs, close opened dbs on error#10690
Merged
coffeegoddd merged 1 commit intomainfrom Mar 16, 2026
Merged
/go/{cmd,libraries} check for valid dbs, close opened dbs on error#10690coffeegoddd merged 1 commit intomainfrom
coffeegoddd merged 1 commit intomainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds proper cleanup of DoltDB resources in the multi-repo environment setup. It tracks opened environments during MultiEnvForDirectory, closes them on error, and adds a Close() method to MultiRepoEnv for orderly shutdown. It also adds a defensive validity check in newDatabase before attempting to use the database.
Changes:
- Track opened
DoltEnvs duringMultiEnvForDirectoryand close theirDoltDBs if the function fails partway through. - Add a
Close()method onMultiRepoEnvto close all heldDoltDBinstances. - Add a validity check in
newDatabaseto return a clear error if theDoltEnvis not valid.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| go/libraries/doltcore/env/multi_repo_env.go | Track opened envs for cleanup on error; add Close() method |
| go/cmd/dolt/commands/engine/utils.go | Add validity check in newDatabase |
| go/libraries/doltcore/env/multi_repo_env_test.go | Add test for MultiRepoEnv.Close() |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
56
to
+59
| dbdata := dEnv.DbData(ctx) | ||
| if !dEnv.Valid() { | ||
| return sqle.Database{}, fmt.Errorf("failed to load database %q: %w", name, errors.Join(dEnv.CfgLoadErr, dEnv.DBLoadError)) | ||
| } |
Contributor
Author
|
goes with dolthub/driver#190 to fix #10687 |
Contributor
Author
|
@coffeegoddd DOLT
|
Contributor
Author
|
@coffeegoddd DOLT
|
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
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.
No description provided.