Commit bb620b7

committed

Ensure ResetConnectionAsync throws MySqlException. Fixes #1602

1 parent ae029d5 commit bb620b7Copy full SHA for bb620b7

File tree

+24

-4

lines changed

+24

-4

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ internal static class EventIds`
`25`	`25`	`public const int ExpectedToReadMoreBytes = 2010;`
`26`	`26`	`public const int ExpectedSessionState1 = 2011;`
`27`	`27`	`public const int ExpectedSessionState6 = 2016;`
	`28`	`+ public const int ResettingConnectionFailed = 2017;`
	`29`	`+ public const int ResetConnection = 2018;`
`28`	`30`
`29`	`31`	`// Session connecting events, 2100-2199`
`30`	`32`	`public const int ConnectingFailed = 2100;`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,12 @@ internal static partial class Log`
`28`	`28`	`[LoggerMessage(EventIds.ResettingConnection, LogLevel.Debug, "Session {SessionId} resetting connection")]`
`29`	`29`	`public static partial void ResettingConnection(ILogger logger, string sessionId);`
`30`	`30`
	`31`	`+ [LoggerMessage(EventIds.ResettingConnectionFailed, LogLevel.Warning, "Session {SessionId} failed to reset connection: {Message}")]`
	`32`	`+ public static partial void ResettingConnectionFailed(ILogger logger, string sessionId, string message);`
	`33`	`+`
	`34`	`+ [LoggerMessage(EventIds.ResetConnection, LogLevel.Debug, "Session {SessionId} reset connection")]`
	`35`	`+ public static partial void ResetConnection(ILogger logger, string sessionId);`
	`36`	`+`
`31`	`37`	`[LoggerMessage(EventIds.ReturningToPool, LogLevel.Trace, "Session {SessionId} returning to pool {PoolId}")]`
`32`	`38`	`public static partial void ReturningToPool(ILogger logger, string sessionId, int poolId);`
`33`	`39`

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -613,9 +613,21 @@ public async ValueTask ResetConnectionAsync(CancellationToken cancellationToken`
`613`	`613`	`{`
`614`	`614`	`var session = Session;`
`615`	`615`	`Log.ResettingConnection(m_logger, session.Id);`
`616`		`- await session.SendAsync(ResetConnectionPayload.Instance, AsyncIOBehavior, cancellationToken).ConfigureAwait(false);`
`617`		`- var payload = await session.ReceiveReplyAsync(AsyncIOBehavior, cancellationToken).ConfigureAwait(false);`
`618`		`- OkPayload.Verify(payload.Span, session);`
	`616`	`+ try`
	`617`	`+ {`
	`618`	`+ await session.SendAsync(ResetConnectionPayload.Instance, AsyncIOBehavior, cancellationToken).ConfigureAwait(false);`
	`619`	`+ var payload = await session.ReceiveReplyAsync(AsyncIOBehavior, cancellationToken).ConfigureAwait(false);`
	`620`	`+ OkPayload.Verify(payload.Span, session);`
	`621`	`+ Log.ResetConnection(m_logger, session.Id);`
	`622`	`+ }`
	`623`	`+ catch (Exception ex)`
	`624`	`+ {`
	`625`	`+ Log.ResettingConnectionFailed(m_logger, session.Id, ex.Message);`
	`626`	`+ if (ex is MySqlException)`
	`627`	`+ throw;`
	`628`	`+ else`
	`629`	`+ throw new MySqlException("Failed to reset connection", ex);`
	`630`	`+ }`
`619`	`631`	`}`
`620`	`632`
`621`	`633`	`[AllowNull]`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ public async Task ResetServerConnectionWhileOpen()`
`321`	`321`	`}`
`322`	`322`	`case 2:`
`323`	`323`	`{`
`324`		`- await Assert.ThrowsAnyAsync<Exception>(async () => await connection.ResetConnectionAsync().ConfigureAwait(false));`
	`324`	`+ await Assert.ThrowsAsync<MySqlException>(async () => await connection.ResetConnectionAsync().ConfigureAwait(false));`
`325`	`325`	`break;`
`326`	`326`	`}`
`327`	`327`	`}`

Comments

(0)