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

Revert "Revert "Wait to dispose RequestAborted CTS (#4447)"" (#6812) 

This reverts commit 29b7c5c030.
This commit is contained in:
Stephen Halter 2019-01-17 16:22:03 -08:00 committed by GitHub
parent 9c017cd805
commit 7d4ae6049f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eng/PatchConfig.props
View File

@ -26,6 +26,7 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.Mvc.Core; Microsoft.AspNetCore.Mvc.Core;
Microsoft.AspNetCore.Routing; Microsoft.AspNetCore.Routing;
Microsoft.AspNetCore.Server.IIS; Microsoft.AspNetCore.Server.IIS;
Microsoft.AspNetCore.Server.Kestrel.Core;
java:signalr; java:signalr;
</PackagesInPatch> </PackagesInPatch>
</PropertyGroup> </PropertyGroup>

36
src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs
View File

@ -367,11 +367,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
// Lock to prevent CancelRequestAbortedToken from attempting to cancel an disposed CTS. // Lock to prevent CancelRequestAbortedToken from attempting to cancel an disposed CTS.
lock (_abortLock) lock (_abortLock)
{ {
if (!_requestAborted) _abortedCts?.Dispose();
{ _abortedCts = null;
_abortedCts?.Dispose();
_abortedCts = null;
}
} }
_requestHeadersParsed = 0; _requestHeadersParsed = 0;
@ -415,15 +412,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
private void CancelRequestAbortedToken() private void CancelRequestAbortedToken()
{ {
try lock (_abortLock)
{ {
_abortedCts.Cancel(); try
_abortedCts.Dispose(); {
_abortedCts = null; _abortedCts?.Cancel();
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.ApplicationError(ConnectionId, TraceIdentifier, ex); Log.ApplicationError(ConnectionId, TraceIdentifier, ex);
}
} }
} }
@ -437,12 +435,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
} }
_requestAborted = true; _requestAborted = true;
}
if (_abortedCts != null) if (_abortedCts != null && !_preventRequestAbortedCancellation)
{ {
// Potentially calling user code. CancelRequestAbortedToken logs any exceptions. // Potentially calling user code. CancelRequestAbortedToken logs any exceptions.
ServiceContext.Scheduler.Schedule(state => ((HttpProtocol)state).CancelRequestAbortedToken(), this); ServiceContext.Scheduler.Schedule(state => ((HttpProtocol)state).CancelRequestAbortedToken(), this);
}
} }
} }
@ -462,8 +460,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
} }
_preventRequestAbortedCancellation = true; _preventRequestAbortedCancellation = true;
_abortedCts?.Dispose();
_abortedCts = null;
} }
} }

20
src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs
View File

@ -53,7 +53,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
var connectionFeatures = new FeatureCollection(); var connectionFeatures = new FeatureCollection();
connectionFeatures.Set(Mock.Of<IConnectionLifetimeFeature>()); connectionFeatures.Set(Mock.Of<IConnectionLifetimeFeature>());
_serviceContext = new TestServiceContext(); _serviceContext = new TestServiceContext()
{
Scheduler = PipeScheduler.Inline
};
_timeoutControl = new Mock<ITimeoutControl>(); _timeoutControl = new Mock<ITimeoutControl>();
_http1ConnectionContext = new HttpConnectionContext _http1ConnectionContext = new HttpConnectionContext
{ {
@ -724,6 +728,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.False(_http1Connection.RequestAborted.IsCancellationRequested); Assert.False(_http1Connection.RequestAborted.IsCancellationRequested);
} }
[Fact]
public void RequestAbortedTokenIsFullyUsableAfterCancellation()
{
var originalToken = _http1Connection.RequestAborted;
var originalRegistration = originalToken.Register(() => { });
_http1Connection.Abort(new ConnectionAbortedException());
Assert.True(originalToken.WaitHandle.WaitOne(TestConstants.DefaultTimeout));
Assert.True(_http1Connection.RequestAborted.WaitHandle.WaitOne(TestConstants.DefaultTimeout));
Assert.Equal(originalToken, originalRegistration.Token);
}
[Fact] [Fact]
public async Task ExceptionDetailNotIncludedWhenLogLevelInformationNotEnabled() public async Task ExceptionDetailNotIncludedWhenLogLevelInformationNotEnabled()
{ {