Ensure ResetConnectionAsync throws MySqlException. Fixes #1602

Author: bgrainger

src/MySqlConnector/Logging/EventIds.cs

@@ -25,6 +25,8 @@ internal static class EventIds
 	public const int ExpectedToReadMoreBytes = 2010;
 	public const int ExpectedSessionState1 = 2011;
 	public const int ExpectedSessionState6 = 2016;
+	public const int ResettingConnectionFailed = 2017;
+	public const int ResetConnection = 2018;
 
 	// Session connecting events, 2100-2199
 	public const int ConnectingFailed = 2100;

src/MySqlConnector/Logging/Log.cs

@@ -28,6 +28,12 @@ internal static partial class Log
 	[LoggerMessage(EventIds.ResettingConnection, LogLevel.Debug, "Session {SessionId} resetting connection")]
 	public static partial void ResettingConnection(ILogger logger, string sessionId);
 
+	[LoggerMessage(EventIds.ResettingConnectionFailed, LogLevel.Warning, "Session {SessionId} failed to reset connection: {Message}")]
+	public static partial void ResettingConnectionFailed(ILogger logger, string sessionId, string message);
+
+	[LoggerMessage(EventIds.ResetConnection, LogLevel.Debug, "Session {SessionId} reset connection")]
+	public static partial void ResetConnection(ILogger logger, string sessionId);
+
 	[LoggerMessage(EventIds.ReturningToPool, LogLevel.Trace, "Session {SessionId} returning to pool {PoolId}")]
 	public static partial void ReturningToPool(ILogger logger, string sessionId, int poolId);
 

src/MySqlConnector/MySqlConnection.cs

@@ -613,9 +613,21 @@ public async ValueTask ResetConnectionAsync(CancellationToken cancellationToken
 	{
 		var session = Session;
 		Log.ResettingConnection(m_logger, session.Id);
-		await session.SendAsync(ResetConnectionPayload.Instance, AsyncIOBehavior, cancellationToken).ConfigureAwait(false);
-		var payload = await session.ReceiveReplyAsync(AsyncIOBehavior, cancellationToken).ConfigureAwait(false);
-		OkPayload.Verify(payload.Span, session);
+		try
+		{
+			await session.SendAsync(ResetConnectionPayload.Instance, AsyncIOBehavior, cancellationToken).ConfigureAwait(false);
+			var payload = await session.ReceiveReplyAsync(AsyncIOBehavior, cancellationToken).ConfigureAwait(false);
+			OkPayload.Verify(payload.Span, session);
+			Log.ResetConnection(m_logger, session.Id);
+		}
+		catch (Exception ex)
+		{
+			Log.ResettingConnectionFailed(m_logger, session.Id, ex.Message);
+			if (ex is MySqlException)
+				throw;
+			else
+				throw new MySqlException("Failed to reset connection", ex);
+		}
 	}
 
 	[AllowNull]

tests/MySqlConnector.Tests/ConnectionTests.cs

@@ -321,7 +321,7 @@ public async Task ResetServerConnectionWhileOpen()
 					}
 					case 2:
 					{
-						await Assert.ThrowsAnyAsync<Exception>(async () => await connection.ResetConnectionAsync().ConfigureAwait(false));
+						await Assert.ThrowsAsync<MySqlException>(async () => await connection.ResetConnectionAsync().ConfigureAwait(false));
 						break;
 					}
 				}