Skip to content

Reset connection on return to pool #179

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

Closed
wants to merge 2 commits into from
Closed

Reset connection on return to pool #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e6ab7
Explicitly wait for asynchronous method.
bgrainger Feb 16, 2017
56ccf87
Reset connection when returned to pool. Fixes #178
bgrainger Feb 16, 2017
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
23 changes: 17 additions & 6 deletions src/MySqlConnector/MySqlClient/ConnectionPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ public async Task<MySqlSession> GetSessionAsync(IOBehavior ioBehavior, Cancellat
}
else
{
// session is valid, reset if supported
if (m_connectionSettings.ConnectionReset)
{
await session.ResetConnectionAsync(m_connectionSettings, ioBehavior, cancellationToken).ConfigureAwait(false);
}
// pooled session is ready to be used; return it
return session;
}
Expand All @@ -58,10 +53,26 @@ public void Return(MySqlSession session)
{
try
{
var success = false;

if (session.PoolGeneration == m_generation)
{
try
{
// reset the connection upon returning it to the pool
if (m_connectionSettings.ConnectionReset)
session.ResetConnectionAsync(m_connectionSettings, IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
success = true;
}
catch (MySqlException)
{
}
}

if (success)
m_sessions.Enqueue(session);
else
session.DisposeAsync(IOBehavior.Synchronous, CancellationToken.None).ConfigureAwait(false);
session.DisposeAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
}
finally
{
Expand Down
1 change: 1 addition & 0 deletions tests/SideBySide.New/ConnectionPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public async Task WaitTimeout()
csb.Pooling = true;
csb.MinimumPoolSize = 0;
csb.MaximumPoolSize = 1;
csb.ConnectionReset = false;
int serverThread;

using (var connection = new MySqlConnection(csb.ConnectionString))
Expand Down