Avoid throwing the same exception instances in parallel (#2859)

halter73 · web-flow · commit 89f48508838d · 2018-08-28T10:56:46.000-07:00
diff --git a/src/Kestrel.Core/Internal/Http/HttpProtocol.cs b/src/Kestrel.Core/Internal/Http/HttpProtocol.cs
@@ -1212,7 +1212,7 @@ private void RejectNonBodyTransferEncodingResponse(bool appCompleted)
             var ex = new InvalidOperationException(CoreStrings.FormatHeaderNotAllowedOnResponse("Transfer-Encoding", StatusCode));
             if (!appCompleted)
             {
-                // Back out of header creation surface exeception in user code
+                // Back out of header creation surface exception in user code
                 _requestProcessingStatus = RequestProcessingStatus.AppStarted;
                 throw ex;
             }
diff --git a/src/Kestrel.Core/Internal/Infrastructure/ConnectionManagerShutdownExtensions.cs b/src/Kestrel.Core/Internal/Infrastructure/ConnectionManagerShutdownExtensions.cs
@@ -27,11 +27,10 @@ public static async Task<bool> CloseAllConnectionsAsync(this ConnectionManager c
         public static async Task<bool> AbortAllConnectionsAsync(this ConnectionManager connectionManager)
         {
             var abortTasks = new List<Task>();
-            var canceledException = new ConnectionAbortedException(CoreStrings.ConnectionAbortedDuringServerShutdown);
 
             connectionManager.Walk(connection =>
             {
-                connection.TransportConnection.Abort(canceledException);
+                connection.TransportConnection.Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedDuringServerShutdown));
                 abortTasks.Add(connection.ExecutionTask);
             });
 
diff --git a/src/Kestrel.Core/Internal/Infrastructure/Streams.cs b/src/Kestrel.Core/Internal/Infrastructure/Streams.cs
@@ -10,8 +10,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
 {
     public class Streams
     {
-        private static readonly ThrowingWriteOnlyStream _throwingResponseStream
-            = new ThrowingWriteOnlyStream(new InvalidOperationException(CoreStrings.ResponseStreamWasUpgraded));
+        private static readonly ThrowingWasUpgradedWriteOnlyStream _throwingResponseStream
+            = new ThrowingWasUpgradedWriteOnlyStream();
         private readonly HttpResponseStream _response;
         private readonly HttpRequestStream _request;
         private readonly WrappingStream _upgradeableResponse;
diff --git a/src/Kestrel.Core/Internal/Infrastructure/ThrowingWasUpgradedWriteOnlyStream.cs b/src/Kestrel.Core/Internal/Infrastructure/ThrowingWasUpgradedWriteOnlyStream.cs
@@ -8,15 +8,8 @@
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
 {
-    public class ThrowingWriteOnlyStream : WriteOnlyStream
+    public class ThrowingWasUpgradedWriteOnlyStream : WriteOnlyStream
     {
-        private readonly Exception _exception;
-
-        public ThrowingWriteOnlyStream(Exception exception)
-        {
-            _exception = exception;
-        }
-
         public override bool CanSeek => false;
 
         public override long Length => throw new NotSupportedException();
@@ -28,13 +21,13 @@ public override long Position
         }
 
         public override void Write(byte[] buffer, int offset, int count)
-            => throw _exception;
+            => throw new InvalidOperationException(CoreStrings.ResponseStreamWasUpgraded);
 
         public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-            => throw _exception;
+            => throw new InvalidOperationException(CoreStrings.ResponseStreamWasUpgraded);
 
         public override void Flush()
-            => throw _exception;
+            => throw new InvalidOperationException(CoreStrings.ResponseStreamWasUpgraded);
 
         public override long Seek(long offset, SeekOrigin origin)
             => throw new NotSupportedException();
diff --git a/src/Kestrel.Transport.Libuv/Internal/LibuvConnection.cs b/src/Kestrel.Transport.Libuv/Internal/LibuvConnection.cs
@@ -88,6 +88,9 @@ public async Task Start()
                     }
                     else
                     {
+                        // This is unexpected.
+                        Log.ConnectionError(ConnectionId, ex);
+
                         inputError = ex;
                         outputError = ex;
                     }
@@ -240,6 +243,7 @@ private Exception LogAndWrapReadError(UvException uvError)
             }
             else
             {
+                // This is unexpected.
                 Log.ConnectionError(ConnectionId, uvError);
                 return new IOException(uvError.Message, uvError);
             }
diff --git a/test/Kestrel.Core.Tests/ThrowingWasUpgradedWriteOnlyStreamTests.cs b/test/Kestrel.Core.Tests/ThrowingWasUpgradedWriteOnlyStreamTests.cs
@@ -0,0 +1,28 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
+{
+    public class ThrowingWasUpgradedWriteOnlyStreamTests
+    {
+        [Fact]
+        public async Task ThrowsOnWrite()
+        {
+            var stream = new ThrowingWasUpgradedWriteOnlyStream();
+
+            Assert.True(stream.CanWrite);
+            Assert.False(stream.CanRead);
+            Assert.False(stream.CanSeek);
+            Assert.False(stream.CanTimeout);
+            Assert.Equal(CoreStrings.ResponseStreamWasUpgraded, Assert.Throws<InvalidOperationException>(() => stream.Write(new byte[1], 0, 1)).Message);
+            Assert.Equal(CoreStrings.ResponseStreamWasUpgraded, (await Assert.ThrowsAsync<InvalidOperationException>(() => stream.WriteAsync(new byte[1], 0, 1))).Message);
+            Assert.Equal(CoreStrings.ResponseStreamWasUpgraded, Assert.Throws<InvalidOperationException>(() => stream.Flush()).Message);
+            Assert.Equal(CoreStrings.ResponseStreamWasUpgraded, (await Assert.ThrowsAsync<InvalidOperationException>(() => stream.FlushAsync())).Message);
+        }
+    }
+}
diff --git a/test/Kestrel.Core.Tests/ThrowingWriteOnlyStreamTests.cs b/test/Kestrel.Core.Tests/ThrowingWriteOnlyStreamTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1212,7 +1212,7 @@ private void RejectNonBodyTransferEncodingResponse(bool appCompleted)`
`1212`	`1212`	`var ex = new InvalidOperationException(CoreStrings.FormatHeaderNotAllowedOnResponse("Transfer-Encoding", StatusCode));`
`1213`	`1213`	`if (!appCompleted)`
`1214`	`1214`	`{`
`1215`		`- // Back out of header creation surface exeception in user code`
	`1215`	`+ // Back out of header creation surface exception in user code`
`1216`	`1216`	`_requestProcessingStatus = RequestProcessingStatus.AppStarted;`
`1217`	`1217`	`throw ex;`
`1218`	`1218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,10 @@ public static async Task<bool> CloseAllConnectionsAsync(this ConnectionManager c`
`27`	`27`	`public static async Task<bool> AbortAllConnectionsAsync(this ConnectionManager connectionManager)`
`28`	`28`	`{`
`29`	`29`	`var abortTasks = new List<Task>();`
`30`		`- var canceledException = new ConnectionAbortedException(CoreStrings.ConnectionAbortedDuringServerShutdown);`
`31`	`30`
`32`	`31`	`connectionManager.Walk(connection =>`
`33`	`32`	`{`
`34`		`- connection.TransportConnection.Abort(canceledException);`
	`33`	`+ connection.TransportConnection.Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedDuringServerShutdown));`
`35`	`34`	`abortTasks.Add(connection.ExecutionTask);`
`36`	`35`	`});`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure`
`10`	`10`	`{`
`11`	`11`	`public class Streams`
`12`	`12`	`{`
`13`		`- private static readonly ThrowingWriteOnlyStream _throwingResponseStream`
`14`		`- = new ThrowingWriteOnlyStream(new InvalidOperationException(CoreStrings.ResponseStreamWasUpgraded));`
	`13`	`+ private static readonly ThrowingWasUpgradedWriteOnlyStream _throwingResponseStream`
	`14`	`+ = new ThrowingWasUpgradedWriteOnlyStream();`
`15`	`15`	`private readonly HttpResponseStream _response;`
`16`	`16`	`private readonly HttpRequestStream _request;`
`17`	`17`	`private readonly WrappingStream _upgradeableResponse;`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ public async Task Start()`
`88`	`88`	`}`
`89`	`89`	`else`
`90`	`90`	`{`
	`91`	`+ // This is unexpected.`
	`92`	`+ Log.ConnectionError(ConnectionId, ex);`
	`93`	`+`
`91`	`94`	`inputError = ex;`
`92`	`95`	`outputError = ex;`
`93`	`96`	`}`
`@@ -240,6 +243,7 @@ private Exception LogAndWrapReadError(UvException uvError)`
`240`	`243`	`}`
`241`	`244`	`else`
`242`	`245`	`{`
	`246`	`+ // This is unexpected.`
`243`	`247`	`Log.ConnectionError(ConnectionId, uvError);`
`244`	`248`	`return new IOException(uvError.Message, uvError);`
`245`	`249`	`}`