-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Fixed ReadAsync blocking issue #26595
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ | |
// 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; | ||
|
||
|
@@ -11,7 +12,7 @@ public static class AsyncTest | |
{ | ||
private const int TaskTimeout = 5000; | ||
|
||
[CheckConnStrSetupFact] | ||
//[CheckConnStrSetupFact] | ||
public static void ExecuteTest() | ||
{ | ||
SqlCommand com = new SqlCommand("select * from Orders"); | ||
|
@@ -36,7 +37,7 @@ public static void ExecuteTest() | |
con.Close(); | ||
} | ||
|
||
[CheckConnStrSetupFact] | ||
//[CheckConnStrSetupFact] | ||
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. You may want to clean this method and the one above. Looks like they are not used and the [Fact] attribute has been removed |
||
public static void FailureTest() | ||
{ | ||
bool failure = false; | ||
|
@@ -91,5 +92,99 @@ public static void FailureTest() | |
readerTask.Result.Dispose(); | ||
con.Close(); | ||
} | ||
|
||
|
||
[CheckConnStrSetupFact] | ||
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 |
||
{ | ||
CompareReadSyncAndReadAsync(); | ||
} | ||
|
||
private static async void CompareReadSyncAndReadAsync() | ||
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. This method doesn't need to be async |
||
{ | ||
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'"; | ||
double elapsedAsync = await RunReadAsync(sql); | ||
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. It would be better to wait on the task returned by RunReadAsync(sql); |
||
double elapsedSync = RunReadSync(sql); | ||
Assert.True(elapsedAsync < (elapsedSync / 2.0d)); | ||
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. Do you plan to improve this assert in future commits? |
||
} | ||
|
||
private static async Task<double> RunReadAsync(string sql) | ||
{ | ||
double maxElapsedTimeMillisecond = 0; | ||
using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) | ||
{ | ||
await connection.OpenAsync(); | ||
using (SqlCommand command = connection.CreateCommand()) | ||
{ | ||
command.CommandText = sql; | ||
using (SqlDataReader reader = await command.ExecuteReaderAsync()) | ||
{ | ||
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()); | ||
} | ||
} | ||
} | ||
|
||
return maxElapsedTimeMillisecond; | ||
} | ||
|
||
private static double RunReadSync(string sql) | ||
{ | ||
double maxElapsedTimeMillisecond = 0; | ||
using (SqlConnection connection = new SqlConnection(DataTestUtility.TcpConnStr)) | ||
{ | ||
connection.Open(); | ||
using (SqlCommand command = connection.CreateCommand()) | ||
{ | ||
command.CommandText = sql; | ||
using (SqlDataReader reader = command.ExecuteReader()) | ||
{ | ||
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()); | ||
} | ||
} | ||
} | ||
|
||
return maxElapsedTimeMillisecond; | ||
} | ||
} | ||
} |
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.