Skip to content

Fix NpgsqlMultiHostDataSource #6561

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

Open
rus-art wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −4
Open

Fix NpgsqlMultiHostDataSource #6561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/Npgsql/NpgsqlMultiHostDataSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,12 @@ static bool IsOnline(DatabaseState state, TargetSessionAttributes preferredType)

return connector;
}
catch (OperationCanceledException oce) when (cancellationToken.IsCancellationRequested && oce.CancellationToken == cancellationToken)
{
if (connector is not null)
pool.Return(connector);
throw;
}
catch (Exception ex)
{
exceptions.Add(ex);
Expand Down
34 changes: 30 additions & 4 deletions test/Npgsql.Tests/MultipleHostsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,13 +1139,39 @@ public async Task OpenConnection_when_canceled_throws_TaskCanceledException()
{
var builder = new NpgsqlDataSourceBuilder(ConnectionString);
await using var dataSource = builder.BuildMultiHost();
using var cts = new CancellationTokenSource();
cts.Cancel();
var cancellationToken = new CancellationToken(true);
var ex = Assert.ThrowsAsync<OperationCanceledException>(async () =>
{
await using var connection = await dataSource.OpenConnectionAsync(cts.Token);
await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
});
Assert.That(ex.CancellationToken, Is.EqualTo(cts.Token));
Assert.That(ex.CancellationToken, Is.EqualTo(cancellationToken));
}

[Test]
public async Task OpenConnection_when_canceled_during_TryGet_throws_OperationCanceledException()
{
await using var primary1 = PgPostmasterMock.Start(state: Primary);
await using var primary2 = PgPostmasterMock.Start(state: Primary);

var connectionString = new NpgsqlConnectionStringBuilder($"Host={primary1.Host}:{primary1.Port},{primary2.Host}:{primary2.Port}")
{
ServerCompatibilityMode = ServerCompatibilityMode.NoTypeLoading,
MaxPoolSize = 1
}.ToString();
await using var dataSource = new NpgsqlDataSourceBuilder(connectionString).BuildMultiHost();

// Exhaust the pool so that TryGetIdleOrNew returns null and we fall through to TryGet
await using var conn1 = await dataSource.OpenConnectionAsync(TargetSessionAttributes.Primary);
await using var conn2 = await dataSource.OpenConnectionAsync(TargetSessionAttributes.Primary);

var cancellationToken = new CancellationToken(true);

var ex = Assert.ThrowsAsync<OperationCanceledException>(async () =>
{
await using var conn3 = await dataSource.OpenConnectionAsync(TargetSessionAttributes.Primary, cancellationToken);
});

Assert.That(ex.CancellationToken, Is.EqualTo(cancellationToken));
}

[Test, IssueLink("https://github.com/npgsql/npgsql/issues/4181")]
Expand Down