Skip to content

Update RetryableWriteOperationExecutor.cs to avoid losing stack trace when rethrowing originalException #1845

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

Open
madelson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update RetryableWriteOperationExecutor.cs to avoid losing stack trace when rethrowing originalException #1845

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions src/MongoDB.Driver/Core/Operations/RetryableWriteOperationExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

using System;
using System.Collections.Generic;
using System.Runtime.ExceptionServices;
using System.Threading.Tasks;
using MongoDB.Driver.Core.Bindings;
using MongoDB.Driver.Core.Servers;
Expand Down Expand Up @@ -50,12 +51,11 @@ public static TResult Execute<TResult>(OperationContext operationContext, IRetry
}
catch (Exception ex)
{
originalException ??= ex;
if (!ShouldRetryOperation(operationContext, operation.WriteConcern, context, server, ex, attempt))
{
throw originalException ?? ex;
Rethrow(originalException);
}

originalException ??= ex;
}

deprioritizedServers ??= new HashSet<ServerDescription>();
Expand All @@ -67,12 +67,12 @@ public static TResult Execute<TResult>(OperationContext operationContext, IRetry
}
catch
{
throw originalException;
Rethrow(originalException);
}

if (!AreRetryableWritesSupported(context.ChannelSource.ServerDescription))
{
throw originalException;
Rethrow(originalException);
}

attempt++;
Expand Down Expand Up @@ -105,12 +105,11 @@ public static async Task<TResult> ExecuteAsync<TResult>(OperationContext operati
}
catch (Exception ex)
{
originalException ??= ex;
if (!ShouldRetryOperation(operationContext, operation.WriteConcern, context, server, ex, attempt))
{
throw originalException ?? ex;
Rethrow(originalException);
}

originalException ??= ex;
}

deprioritizedServers ??= new HashSet<ServerDescription>();
Expand All @@ -122,12 +121,12 @@ public static async Task<TResult> ExecuteAsync<TResult>(OperationContext operati
}
catch
{
throw originalException;
Rethrow(originalException);
}

if (!AreRetryableWritesSupported(context.ChannelSource.ServerDescription))
{
throw originalException;
Rethrow(originalException);
}

attempt++;
Expand Down Expand Up @@ -185,5 +184,11 @@ private static bool DoesContextAllowRetries(RetryableWriteContext context, Serve
private static bool IsOperationAcknowledged(WriteConcern writeConcern)
=> writeConcern == null || // null means use server default write concern which implies acknowledged
writeConcern.IsAcknowledged;

private static void Rethrow(Exception exception)
{
// Use ExceptionDispatchInfo to avoid losing the original exception stack trace
ExceptionDispatchInfo.Capture(originalException).Throw();
}
}
}