Handle XA_RBDEADLOCK on XA END while still calling XA ROLLBACK afterwards. (#1589)

PatrickMNL · bgrainger · web-flow · commit 728e2549199b · 2025-09-05T07:55:48.000-07:00
Catch XA_RBDEADLOCK on XA END seperately, still calling XA ROLLBACK afterwards to clean up the connection state.

Signed-off-by: Patrick le Duc &lt;patrick.leduc@miniclip.com&gt;
Signed-off-by: Bradley Grainger &lt;bgrainger@gmail.com&gt;
Co-authored-by: Bradley Grainger &lt;bgrainger@gmail.com&gt;
diff --git a/src/MySqlConnector/Core/XaEnlistedTransaction.cs b/src/MySqlConnector/Core/XaEnlistedTransaction.cs
@@ -30,23 +30,25 @@ protected override void OnCommit(Enlistment enlistment)
 
 	protected override void OnRollback(Enlistment enlistment)
 	{
-		try
+		if (!IsPrepared)
 		{
 			try
 			{
-				if (!IsPrepared)
-					ExecuteXaCommand("END");
+				ExecuteXaCommand("END");
 			}
-			catch (MySqlException ex) when (ex.ErrorCode is MySqlErrorCode.XAERRemoveFail && ex.Message.Contains("ROLLBACK ONLY"))
+			catch (MySqlException ex) when (ex.ErrorCode is MySqlErrorCode.XARBDeadlock || (ex.ErrorCode is MySqlErrorCode.XAERRemoveFail && ex.Message.Contains("ROLLBACK ONLY")))
 			{
-				// ignore unprepared end failure when XAERRemoveFail is returned telling us the XA state is ROLLBACK ONLY.
+				// ignore deadlock notification AND any unprepared end failure when XAERRemoveFail is returned telling us the XA state is ROLLBACK ONLY.
 			}
+		}
 
+		try
+		{
 			ExecuteXaCommand("ROLLBACK");
 		}
 		catch (MySqlException ex) when (ex.ErrorCode is MySqlErrorCode.XARBDeadlock)
 		{
-			// ignore deadlock when rolling back
+			// ignore deadlock notification when rolling back.
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -30,23 +30,25 @@ protected override void OnCommit(Enlistment enlistment)`
`30`	`30`
`31`	`31`	`protected override void OnRollback(Enlistment enlistment)`
`32`	`32`	`{`
`33`		`- try`
	`33`	`+ if (!IsPrepared)`
`34`	`34`	`{`
`35`	`35`	`try`
`36`	`36`	`{`
`37`		`- if (!IsPrepared)`
`38`		`- ExecuteXaCommand("END");`
	`37`	`+ ExecuteXaCommand("END");`
`39`	`38`	`}`
`40`		`- catch (MySqlException ex) when (ex.ErrorCode is MySqlErrorCode.XAERRemoveFail && ex.Message.Contains("ROLLBACK ONLY"))`
	`39`	`+ catch (MySqlException ex) when (ex.ErrorCode is MySqlErrorCode.XARBDeadlock \|\| (ex.ErrorCode is MySqlErrorCode.XAERRemoveFail && ex.Message.Contains("ROLLBACK ONLY")))`
`41`	`40`	`{`
`42`		`- // ignore unprepared end failure when XAERRemoveFail is returned telling us the XA state is ROLLBACK ONLY.`
	`41`	`+ // ignore deadlock notification AND any unprepared end failure when XAERRemoveFail is returned telling us the XA state is ROLLBACK ONLY.`
`43`	`42`	`}`
	`43`	`+ }`
`44`	`44`
	`45`	`+ try`
	`46`	`+ {`
`45`	`47`	`ExecuteXaCommand("ROLLBACK");`
`46`	`48`	`}`
`47`	`49`	`catch (MySqlException ex) when (ex.ErrorCode is MySqlErrorCode.XARBDeadlock)`
`48`	`50`	`{`
`49`		`- // ignore deadlock when rolling back`
	`51`	`+ // ignore deadlock notification when rolling back.`
`50`	`52`	`}`
`51`	`53`	`}`
`52`	`54`