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

This reverts commit 29b7c5c.
dotnet · Jan 18, 2019 · 7d4ae60 · 7d4ae60 · davidfowl · Jan 18, 2019
1 parent 9c017cd
commit 7d4ae60
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
@@ -26,6 +26,7 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.Mvc.Core;
       Microsoft.AspNetCore.Routing;
       Microsoft.AspNetCore.Server.IIS;
+      Microsoft.AspNetCore.Server.Kestrel.Core;
       java:signalr;
     </PackagesInPatch>
   </PropertyGroup>

diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs
@@ -367,11 +367,8 @@ public void Reset()
             // Lock to prevent CancelRequestAbortedToken from attempting to cancel an disposed CTS.
             lock (_abortLock)
             {
-                if (!_requestAborted)
-                {
-                    _abortedCts?.Dispose();
-                    _abortedCts = null;
-                }
+                _abortedCts?.Dispose();
+                _abortedCts = null;
             }
 
             _requestHeadersParsed = 0;
@@ -415,15 +412,16 @@ protected virtual bool BeginRead(out ValueTask<ReadResult> awaitable)
 
         private void CancelRequestAbortedToken()
         {
-            try
-            {
-                _abortedCts.Cancel();
-                _abortedCts.Dispose();
-                _abortedCts = null;
-            }
-            catch (Exception ex)
+            lock (_abortLock)
             {
-                Log.ApplicationError(ConnectionId, TraceIdentifier, ex);
+                try
+                {
+                    _abortedCts?.Cancel();
+                }
+                catch (Exception ex)
+                {
+                    Log.ApplicationError(ConnectionId, TraceIdentifier, ex);
+                }
             }
         }
 
@@ -437,12 +435,12 @@ protected void AbortRequest()
                 }
 
                 _requestAborted = true;
-            }
 
-            if (_abortedCts != null)
-            {
-                // Potentially calling user code. CancelRequestAbortedToken logs any exceptions.
-                ServiceContext.Scheduler.Schedule(state => ((HttpProtocol)state).CancelRequestAbortedToken(), this);
+                if (_abortedCts != null && !_preventRequestAbortedCancellation)
+                {
+                    // Potentially calling user code. CancelRequestAbortedToken logs any exceptions.
+                    ServiceContext.Scheduler.Schedule(state => ((HttpProtocol)state).CancelRequestAbortedToken(), this);
+                }
             }
         }
 
@@ -462,8 +460,6 @@ private void PreventRequestAbortedCancellation()
                 }
 
                 _preventRequestAbortedCancellation = true;
-                _abortedCts?.Dispose();
-                _abortedCts = null;
             }
         }
 

diff --git a/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs b/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs
@@ -53,7 +53,11 @@ public Http1ConnectionTests()
             var connectionFeatures = new FeatureCollection();
             connectionFeatures.Set(Mock.Of<IConnectionLifetimeFeature>());
 
-            _serviceContext = new TestServiceContext();
+            _serviceContext = new TestServiceContext()
+            {
+                Scheduler = PipeScheduler.Inline
+            };
+
             _timeoutControl = new Mock<ITimeoutControl>();
             _http1ConnectionContext = new HttpConnectionContext
             {
@@ -724,6 +728,20 @@ public async Task RequestAbortedTokenIsResetBeforeLastWriteWithChunkedEncoding()
             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]
         public async Task ExceptionDetailNotIncludedWhenLogLevelInformationNotEnabled()
         {