Stop recycling MySqlDataReader instances. Fixes #1459

bgrainger · bgrainger · commit 320a00708245 · 2024-04-21T15:59:22.000-07:00
diff --git a/src/MySqlConnector/Core/ConnectionPool.cs b/src/MySqlConnector/Core/ConnectionPool.cs
@@ -173,6 +173,7 @@ public async ValueTask ReturnAsync(IOBehavior ioBehavior, ServerSession session)
 				_ = m_leasedSessions.Remove(session.Id);
 			MetricsReporter.RemoveUsed(this);
 			session.OwningConnection = null;
+			session.DataReader = new();
 			var sessionHealth = GetSessionHealth(session);
 			if (sessionHealth == 0)
 			{
diff --git a/src/MySqlConnector/Core/ServerSession.cs b/src/MySqlConnector/Core/ServerSession.cs
@@ -69,7 +69,7 @@ public ServerSession(ILogger logger, ConnectionPool? pool, int poolGeneration, i
 	public bool SupportsSessionTrack { get; private set; }
 	public bool ProcAccessDenied { get; set; }
 	public ICollection<KeyValuePair<string, object?>> ActivityTags => m_activityTags;
-	public MySqlDataReader DataReader { get; }
+	public MySqlDataReader DataReader { get; set; }
 
 	public ValueTask ReturnToPoolAsync(IOBehavior ioBehavior, MySqlConnection? owningConnection)
 	{

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ public async ValueTask ReturnAsync(IOBehavior ioBehavior, ServerSession session)`
`173`	`173`	`_ = m_leasedSessions.Remove(session.Id);`
`174`	`174`	`MetricsReporter.RemoveUsed(this);`
`175`	`175`	`session.OwningConnection = null;`
	`176`	`+ session.DataReader = new();`
`176`	`177`	`var sessionHealth = GetSessionHealth(session);`
`177`	`178`	`if (sessionHealth == 0)`
`178`	`179`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public ServerSession(ILogger logger, ConnectionPool? pool, int poolGeneration, i`
`69`	`69`	`public bool SupportsSessionTrack { get; private set; }`
`70`	`70`	`public bool ProcAccessDenied { get; set; }`
`71`	`71`	`public ICollection<KeyValuePair<string, object?>> ActivityTags => m_activityTags;`
`72`		`- public MySqlDataReader DataReader { get; }`
	`72`	`+ public MySqlDataReader DataReader { get; set; }`
`73`	`73`
`74`	`74`	`public ValueTask ReturnToPoolAsync(IOBehavior ioBehavior, MySqlConnection? owningConnection)`
`75`	`75`	`{`