Skip to content

Don't clear used connection pools #2217

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

Merged
myieye merged 3 commits into from
Mar 23, 2026
Merged

Don't clear used connection pools #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a7fe6b
Don't clear used connection pools
myieye Mar 19, 2026
24ebdc0
Dispose created connections
myieye Mar 19, 2026
75e737f
Dispose db context
myieye Mar 23, 2026
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
5 changes: 4 additions & 1 deletion backend/FwLite/LcmCrdt.Tests/SnapshotAtCommitServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using SIL.Harmony.Db;
using Microsoft.Data.Sqlite;
using SIL.Harmony.Core;
using Bogus.DataSets;

namespace LcmCrdt.Tests;

Expand Down Expand Up @@ -329,8 +330,10 @@ await _api.CreateWritingSystem(new WritingSystem()
public async Task DisposeAsync()
{
await _dbContext.Database.CloseConnectionAsync();
SqliteConnection.ClearAllPools();
using var clearConn = new SqliteConnection($"Data Source={_dbPath}");
SqliteConnection.ClearPool(clearConn);
await _dbContext.Database.EnsureDeletedAsync();
await _dbContext.DisposeAsync();
await _services.DisposeAsync();
if (File.Exists(_dbPath))
{
Expand Down
9 changes: 5 additions & 4 deletions backend/FwLite/LcmCrdt/SnapshotAtCommitService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class SnapshotAtCommitService(
{
using var activity = _activitySource.StartActivity();
activity?.SetTag("app.commit_id", commitId);
var dbContext = await crdtDbContextFactory.CreateDbContextAsync();
await using var dbContext = await crdtDbContextFactory.CreateDbContextAsync();
var commit = await dbContext.Commits.SingleOrDefaultAsync(c => c.Id == commitId);
if (commit is null)
{
Expand All @@ -42,7 +42,7 @@ public class SnapshotAtCommitService(
await ForkDatabase(dbPath, forkDbPath);

var project = new CrdtProject(currentProjectService.Project.Name, forkDbPath);
var serviceScope = serviceProvider.CreateAsyncScope();
await using var serviceScope = serviceProvider.CreateAsyncScope();
var scopedCurrentProjectService = serviceScope.ServiceProvider.GetRequiredService<CurrentProjectService>();
var projectData = await scopedCurrentProjectService.SetupProjectContext(project);

Expand All @@ -51,7 +51,7 @@ public class SnapshotAtCommitService(
var optionsBuilder = new DbContextOptionsBuilder<LcmCrdtDbContext>()
.UseSqlite($"Data Source={forkDbPath}");
LcmCrdtKernel.ConfigureDbOptions(serviceScope.ServiceProvider, optionsBuilder);
ICrdtDbContext forkDbContext = new LcmCrdtDbContext(optionsBuilder.Options, crdtConfig);
await using var forkDbContext = new LcmCrdtDbContext(optionsBuilder.Options, crdtConfig);

var deleted = await DeleteCommitsAfter(forkDbContext, commit, preserveAllFieldWorksCommits);
logger.LogInformation("Deleted {Deleted} commits after {CommitId}", deleted, commitId);
Expand All @@ -68,7 +68,8 @@ public class SnapshotAtCommitService(
{
try
{
SqliteConnection.ClearAllPools();
using var clearConn = new SqliteConnection($"Data Source={forkDbPath}");
SqliteConnection.ClearPool(clearConn);
File.Delete(forkDbPath);
}
catch (Exception ex)
Expand Down
Loading