Skip to content
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

Jump to bottom

DocumentClient: Fixes ObjectDisposedException during Background Refresh by adding Cancellation Token #3278

Merged
merged 9 commits into from
Jun 21, 2022
Merged

DocumentClient: Fixes ObjectDisposedException during Background Refresh by adding Cancellation Token #3278

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4a3c41
add test to catch the ObjectDisposedException from the debug trace
Jun 16, 2022
7901bd6
create a cancellation token in document client and propogate it throu…
Jun 20, 2022
974dc8c
minor string fixes
Jun 20, 2022
c9d85b6
Merge branch 'master' into users/imanvt/3259-cosmosclient-objectdisposed
imanvt Jun 20, 2022
be34972
minor accessibility modifier changes
Jun 20, 2022
19d7b7d
fix exception message causing null reference exception
Jun 20, 2022
fdee3a3
address comments and enable telemetry in test
Jun 21, 2022
a34ae67
fix ex message in req timeout
Jun 21, 2022
2f55606
suppress telemetry request timeout exceptions upon disposal of client
Jun 21, 2022
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
4 changes: 2 additions & 2 deletions Microsoft.Azure.Cosmos/src/DocumentClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ internal partial class DocumentClient : IDisposable, IAuthorizationTokenProvider
//SessionContainer.
internal ISessionContainer sessionContainer;

private CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();

private AsyncLazy<QueryPartitionProvider> queryPartitionProvider;

Expand Down Expand Up @@ -1205,7 +1205,7 @@ public void Dispose()
return;
}

if (this.cancellationTokenSource != null && !this.cancellationTokenSource.IsCancellationRequested)
if (!this.cancellationTokenSource.IsCancellationRequested)
{
this.cancellationTokenSource.Cancel();
imanvt marked this conversation as resolved.
Show resolved Hide resolved
}
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Azure.Cosmos/src/GatewayAccountReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ internal sealed class GatewayAccountReader
private readonly AuthorizationTokenProvider cosmosAuthorization;
private readonly CosmosHttpClient httpClient;
private readonly Uri serviceEndpoint;
private CancellationToken cancellationToken;
private readonly CancellationToken cancellationToken;

// Backlog: Auth abstractions are spilling through. 4 arguments for this CTOR are result of it.
public GatewayAccountReader(Uri serviceEndpoint,
Expand Down Expand Up @@ -71,7 +71,7 @@ await this.cosmosAuthorization.AddAuthorizationHeaderAsync(
{
trace.AddDatum("Client Side Request Stats", stats);
throw CosmosExceptionFactory.CreateRequestTimeoutException(
message: ex.Data?["Message"].ToString(),
message: ex.Message,
headers: new Headers()
{
ActivityId = System.Diagnostics.Trace.CorrelationManager.ActivityId.ToString()
Expand Down
6 changes: 3 additions & 3 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/CosmosClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,14 @@ void TraceHandler(string message)
using CosmosClient cosmos = new(ConnectionString);
}

string assertMsg = "";
string assertMsg = string.Empty;
imanvt marked this conversation as resolved.
Show resolved Hide resolved

foreach (string s in errors)
{
assertMsg += s + "\n";
assertMsg += s + Environment.NewLine;
}

Assert.AreEqual(0, errors.Count, $"\nErrors found in trace:\n{assertMsg}");
Assert.AreEqual(0, errors.Count, $"{Environment.NewLine}Errors found in trace:{Environment.NewLine}{assertMsg}");
}

private class TestTraceListener : TraceListener
Expand Down