This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Fixed ReadAsync blocking issue #26595
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,94 +2,106 @@ | |
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using System.Diagnostics; | ||
using System.Threading.Tasks; | ||
using Xunit; | ||
|
||
namespace System.Data.SqlClient.ManualTesting.Tests | ||
{ | ||
public static class AsyncTest | ||
{ | ||
private const int TaskTimeout = 5000; | ||
|
||
[CheckConnStrSetupFact] | ||
public static void ExecuteTest() | ||
public static void TestReadAsync() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can this be changed to |
||
{ | ||
SqlCommand com = new SqlCommand("select * from Orders"); | ||
SqlConnection con = new SqlConnection(DataTestUtility.TcpConnStr); | ||
|
||
com.Connection = con; | ||
|
||
con.Open(); | ||
|
||
Task<SqlDataReader> readerTask = com.ExecuteReaderAsync(); | ||
bool taskCompleted = readerTask.Wait(TaskTimeout); | ||
Assert.True(taskCompleted, "FAILED: ExecuteReaderAsync Task did not complete successfully."); | ||
|
||
SqlDataReader reader = readerTask.Result; | ||
|
||
int rows; | ||
for (rows = 0; reader.Read(); rows++) ; | ||
|
||
Assert.True(rows == 830, string.Format("FAILED: ExecuteTest reader had wrong number of rows. Expected: {0}. Actual: {1}", 830, rows)); | ||
|
||
reader.Dispose(); | ||
con.Close(); | ||
const string sql = "SET NOCOUNT ON" | ||
+ " SELECT 'a'" | ||
+ " DECLARE @t DATETIME = SYSDATETIME()" | ||
+ " WHILE DATEDIFF(s, @t, SYSDATETIME()) < 20 BEGIN" | ||
+ " SELECT 2 x INTO #y" | ||
+ " DROP TABLE #y" | ||
+ " END" | ||
+ " SELECT 'b'"; | ||
Task<double> t = RunReadAsync(sql); | ||
double elapsedSync = RunReadSync(sql); | ||
t.Wait(); | ||
double elapsedAsync = t.Result; | ||
Console.WriteLine("Asynchronous Operation: " + elapsedAsync + "ms"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove Console statements. |
||
Console.WriteLine("Synchronous Operation: " + elapsedSync + "ms"); | ||
Assert.True(elapsedAsync < elapsedSync, "Asynchronous operation should be finished quicker than synchronous one"); | ||
int limit = 100; | ||
Assert.True(elapsedAsync < limit, $"Asynchronous operation should be finished within {limit}ms"); | ||
} | ||
|
||
[CheckConnStrSetupFact] | ||
public static void FailureTest() | ||
private static async Task<double> RunReadAsync(string sql) | ||
{ | ||
bool failure = false; | ||
bool taskCompleted = false; | ||
|
||
SqlCommand com = new SqlCommand("select * from Orders"); | ||
SqlConnection con = new SqlConnection((new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr) { Pooling = false }).ConnectionString); | ||
com.Connection = con; | ||
con.Open(); | ||
|
||
Task<int> nonQueryTask = com.ExecuteNonQueryAsync(); | ||
try | ||
double maxElapsedTimeMillisecond = 0; | ||
using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) | ||
{ | ||
com.ExecuteNonQueryAsync().Wait(TaskTimeout); | ||
} | ||
catch (AggregateException agrEx) | ||
{ | ||
agrEx.Handle( | ||
(ex) => | ||
await connection.OpenAsync(); | ||
using (SqlCommand command = connection.CreateCommand()) | ||
{ | ||
command.CommandText = sql; | ||
using (SqlDataReader reader = await command.ExecuteReaderAsync()) | ||
{ | ||
Assert.True(ex is InvalidOperationException, "FAILED: Thrown exception for ExecuteNonQueryAsync was not an InvalidOperationException"); | ||
failure = true; | ||
return true; | ||
}); | ||
Task<bool> t; | ||
Stopwatch stopwatch = new Stopwatch(); | ||
do | ||
{ | ||
do | ||
{ | ||
stopwatch.Start(); | ||
t = reader.ReadAsync(); | ||
stopwatch.Stop(); | ||
double elased = stopwatch.Elapsed.TotalMilliseconds; | ||
if (maxElapsedTimeMillisecond < elased) | ||
{ | ||
maxElapsedTimeMillisecond = elased; | ||
} | ||
} | ||
while (await t); | ||
} | ||
while (reader.NextResult()); | ||
} | ||
} | ||
} | ||
Assert.True(failure, "FAILED: No exception thrown after trying second ExecuteNonQueryAsync."); | ||
failure = false; | ||
|
||
taskCompleted = nonQueryTask.Wait(TaskTimeout); | ||
Assert.True(taskCompleted, "FAILED: ExecuteNonQueryAsync Task did not complete successfully."); | ||
return maxElapsedTimeMillisecond; | ||
} | ||
|
||
Task<SqlDataReader> readerTask = com.ExecuteReaderAsync(); | ||
try | ||
{ | ||
com.ExecuteReaderAsync().Wait(TaskTimeout); | ||
} | ||
catch (AggregateException agrEx) | ||
private static double RunReadSync(string sql) | ||
{ | ||
double maxElapsedTimeMillisecond = 0; | ||
using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) | ||
{ | ||
agrEx.Handle( | ||
(ex) => | ||
connection.Open(); | ||
using (SqlCommand command = connection.CreateCommand()) | ||
{ | ||
command.CommandText = sql; | ||
using (SqlDataReader reader = command.ExecuteReader()) | ||
{ | ||
Assert.True(ex is InvalidOperationException, "FAILED: Thrown exception for ExecuteReaderAsync was not an InvalidOperationException: " + ex); | ||
failure = true; | ||
return true; | ||
}); | ||
bool result; | ||
Stopwatch stopwatch = new Stopwatch(); | ||
do | ||
{ | ||
do | ||
{ | ||
stopwatch.Start(); | ||
result = reader.Read(); | ||
stopwatch.Stop(); | ||
double elased = stopwatch.Elapsed.TotalMilliseconds; | ||
if (maxElapsedTimeMillisecond < elased) | ||
{ | ||
maxElapsedTimeMillisecond = elased; | ||
} | ||
} | ||
while (result); | ||
} | ||
while (reader.NextResult()); | ||
} | ||
} | ||
} | ||
Assert.True(failure, "FAILED: No exception thrown after trying second ExecuteReaderAsync."); | ||
|
||
taskCompleted = readerTask.Wait(TaskTimeout); | ||
Assert.True(taskCompleted, "FAILED: ExecuteReaderAsync Task did not complete successfully."); | ||
|
||
readerTask.Result.Dispose(); | ||
con.Close(); | ||
return maxElapsedTimeMillisecond; | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why this change specifically? Framework TdsParser also has this line
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment
// Can't retry TryProcessDone
seems interesting. Looks like syncOverAsync was set totrue
to prevent a retry of processing the Done TDS token. Have you checked if this "retry" is not invoked after your changes?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@corivera TryProcessDone sets syncOverAsync during async execution which makes the execution sync for pretty much everything, since syncOverAsync forces a blocking network call. TryProcessDone was turning out to be a bottleneck that @geleems figured out.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I meant , are there code paths which could retry Done token processing in certain scenarios for a single SqlDataReader Read operation, instead of multiple Read() operations, which needs to be prevented?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@saurabh500
TryProcessDone()
runs multiple times untilReadSni()
actually returns packets, and it is processed byTryProcessDone()
. OnceDONE
token is processed, codeflow moves forward, and there is no code path to RETRY theDONE
token processing, which is already done.