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

Fixes "InvalidOperationException" errors by performing async operations in SemaphoreSlim #796

Merged
merged 20 commits into from
Nov 19, 2020
Merged

Fixes "InvalidOperationException" errors by performing async operations in SemaphoreSlim #796

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0f27c26
Fixes "InvalidOperationException" errors by performing async write op…
cheenamalhotra Nov 13, 2020
aca1cc6
Add license header
cheenamalhotra Nov 13, 2020
65ec669
Fix default include
cheenamalhotra Nov 13, 2020
9ea1207
Suppress issue 422 from pipelines, till it gets fixed.
cheenamalhotra Nov 13, 2020
7cc72ed
Fix Async + Mars perf issue
cheenamalhotra Nov 15, 2020
ddcfd41
Improvements
cheenamalhotra Nov 16, 2020
f6b5da4
Unblock Sync overrides
cheenamalhotra Nov 17, 2020
3eaa757
Move release to finally
cheenamalhotra Nov 17, 2020
de07449
Implementing SNINetworkStream fixes issue 422 for non-encrypted TCP c…
cheenamalhotra Nov 17, 2020
acfcb35
Revert test change
cheenamalhotra Nov 17, 2020
664529a
Change to async/await
cheenamalhotra Nov 17, 2020
dcd2531
Apply suggestions from code review
cheenamalhotra Nov 17, 2020
cd0153a
Reset locks
cheenamalhotra Nov 17, 2020
72c54a8
Merge branch 'fix459' of https://github.com/cheenamalhotra/SqlClient …
cheenamalhotra Nov 17, 2020
3e90787
Merge branch 'master' into fix459
cheenamalhotra Nov 18, 2020
b743e45
Simplified design as SemaphoreSlim is concurrent - confirmed.
cheenamalhotra Nov 18, 2020
7d341af
Improve
cheenamalhotra Nov 18, 2020
f76e1c0
Revert unwanted changes
cheenamalhotra Nov 18, 2020
10421a9
Adding queue back to maintain FIFO for extra security.
cheenamalhotra Nov 18, 2020
d6b71ec
Cleanup
cheenamalhotra Nov 19, 2020
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
22 changes: 12 additions & 10 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIStreams.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ public SNISslStream(Stream innerStream, bool leaveInnerStreamOpen, RemoteCertifi
}

// Prevent the ReadAsync's collision by running task in Semaphore Slim
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
await _readAsyncQueueSemaphore.WaitAsync().ConfigureAwait(false);
try
{
return _readAsyncQueueSemaphore.WaitAsync()
.ContinueWith(_ => base.ReadAsync(buffer, offset, count, cancellationToken).GetAwaiter().GetResult());
return await base.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
}
finally
{
Expand All @@ -40,11 +40,12 @@ public override Task<int> ReadAsync(byte[] buffer, int offset, int count, Cancel
}

// Prevent the WriteAsync's collision by running task in Semaphore Slim
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
await _writeAsyncQueueSemaphore.WaitAsync().ConfigureAwait(false);
try
{
return _writeAsyncQueueSemaphore.WaitAsync().ContinueWith(_ => base.WriteAsync(buffer, offset, count, cancellationToken));
await base.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
}
finally
{
Expand All @@ -68,12 +69,12 @@ public SNINetworkStream(Socket socket, bool ownsSocket) : base(socket, ownsSocke
}

// Prevent the ReadAsync's collision by running task in Semaphore Slim
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
await _readAsyncQueueSemaphore.WaitAsync().ConfigureAwait(false);
try
{
return _readAsyncQueueSemaphore.WaitAsync()
.ContinueWith(_ => base.ReadAsync(buffer, offset, count, cancellationToken).GetAwaiter().GetResult());
return await base.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
}
finally
{
Expand All @@ -82,11 +83,12 @@ public override Task<int> ReadAsync(byte[] buffer, int offset, int count, Cancel
}

// Prevent the WriteAsync's collision by running task in Semaphore Slim
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
await _writeAsyncQueueSemaphore.WaitAsync().ConfigureAwait(false);
try
{
return _writeAsyncQueueSemaphore.WaitAsync().ContinueWith(_ => base.WriteAsync(buffer, offset, count, cancellationToken));
await base.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
}
finally
{
Expand Down