huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2'

This commit is contained in:
BrennanConroy 2018-07-31 16:43:06 -07:00
parent 7e524a7b58 c8eedb3540
commit d7c696f51f
2 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Http.Connections/Internal/HttpConnectionContext.cs
View File

@ -88,6 +88,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal
public Task TransportTask { get; set; }
public Task PreviousPollTask { get; set; } = Task.CompletedTask;
public Task ApplicationTask { get; set; }
public DateTime LastSeenUtc { get; set; }

24
src/Microsoft.AspNetCore.Http.Connections/Internal/HttpConnectionDispatcher.cs
View File

@ -188,6 +188,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal
return;
}
// Create a new Tcs every poll to keep track of the poll finishing, so we can properly wait on previous polls
var currentRequestTcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
await connection.StateLock.WaitAsync();
try
{
@ -205,17 +208,17 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal
{
var existing = connection.GetHttpContext();
Log.ConnectionAlreadyActive(_logger, connection.ConnectionId, existing.TraceIdentifier);
}
using (connection.Cancellation)
{
// Cancel the previous request
connection.Cancellation?.Cancel();
// Wait for the previous request to drain
await connection.TransportTask;
// Always wait for the previous request to drain
await connection.PreviousPollTask;
Log.PollCanceled(_logger, connection.ConnectionId, existing.TraceIdentifier);
}
connection.PreviousPollTask = currentRequestTcs.Task;
}
// Mark the connection as active
@ -267,6 +270,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal
var resultTask = await Task.WhenAny(connection.ApplicationTask, connection.TransportTask);
try
{
var pollAgain = true;
// If the application ended before the transport task then we potentially need to end the connection
@ -303,12 +308,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal
}
if (pollAgain)
{
// Otherwise, we update the state to inactive again and wait for the next poll
await connection.StateLock.WaitAsync();
try
{
if (connection.Status == HttpConnectionStatus.Active)
{
// Mark the connection as inactive
connection.LastSeenUtc = DateTime.UtcNow;
@ -323,8 +322,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal
}
finally
{
connection.StateLock.Release();
}
// Artificial task queue
// This will cause incoming polls to wait until the previous poll has finished updating internal state info
currentRequestTcs.TrySetResult(null);
}
}
}