Channel internal HttpClient created with no timeout (#595)

Author: JamesNK

src/Grpc.Net.Client/GrpcChannel.cs

@@ -20,6 +20,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using Grpc.Core;
 using Grpc.Net.Client.Internal;
 using Grpc.Net.Compression;
@@ -67,7 +68,7 @@ internal GrpcChannel(Uri address, GrpcChannelOptions channelOptions) : base(addr
             _shouldDisposeHttpClient = channelOptions.HttpClient == null || channelOptions.DisposeHttpClient;
 
             Address = address;
-            HttpClient = channelOptions.HttpClient ?? new HttpClient();
+            HttpClient = channelOptions.HttpClient ?? CreateInternalHttpClient();
             SendMaxMessageSize = channelOptions.MaxSendMessageSize;
             ReceiveMaxMessageSize = channelOptions.MaxReceiveMessageSize;
             CompressionProviders = ResolveCompressionProviders(channelOptions.CompressionProviders);
@@ -88,6 +89,23 @@ internal GrpcChannel(Uri address, GrpcChannelOptions channelOptions) : base(addr
             }
         }
 
+        private static HttpClient CreateInternalHttpClient()
+        {
+            var httpClient = new HttpClient();
+
+            // Long running server and duplex streaming gRPC requests may not
+            // return any messages for over 100 seconds, triggering a cancellation
+            // of HttpClient.SendAsync. Disable timeout in internally created
+            // HttpClient for channel.
+            //
+            // gRPC deadline should be the recommended way to timeout gRPC calls.
+            //
+            // https://github.com/dotnet/corefx/issues/41650
+            httpClient.Timeout = Timeout.InfiniteTimeSpan;
+
+            return httpClient;
+        }
+
         internal GrpcMethodInfo GetCachedGrpcMethodInfo(IMethod method)
         {
             return _methodInfoCache.GetOrAdd(method, _createMethodInfoFunc);

src/Grpc.Net.ClientFactory/GrpcClientServiceExtensions.cs

@@ -20,6 +20,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using Grpc.Core;
 using Grpc.Net.ClientFactory;
 using Grpc.Net.ClientFactory.Internal;
@@ -305,6 +306,16 @@ private static IHttpClientBuilder AddGrpcClientCore<TClient>(this IServiceCollec
                 var clientOptions = os.Get(name);
 
                 httpClient.BaseAddress = clientOptions.Address;
+
+                // Long running server and duplex streaming gRPC requests may not
+                // return any messages for over 100 seconds, triggering a cancellation
+                // of HttpClient.SendAsync. Disable timeout in internally created
+                // HttpClient for channel.
+                //
+                // gRPC deadline should be the recommended way to timeout gRPC calls.
+                //
+                // https://github.com/dotnet/corefx/issues/41650
+                httpClient.Timeout = Timeout.InfiniteTimeSpan;
             };
 
             IHttpClientBuilder clientBuilder = services.AddGrpcHttpClient<TClient>(name, configureTypedClient);

test/Grpc.Net.Client.Tests/GrpcChannelTests.cs

@@ -42,6 +42,16 @@ public void Build_SslCredentialsWithHttps_Success()
             Assert.IsTrue(channel.IsSecure);
         }
 
+        [Test]
+        public void Build_NoHttpClient_InternalHttpClientHasInfiniteTimeout()
+        {
+            // Arrange & Act
+            var channel = GrpcChannel.ForAddress("https://localhost");
+
+            // Assert
+            Assert.AreEqual(Timeout.InfiniteTimeSpan, channel.HttpClient.Timeout);
+        }
+
         [Test]
         public void Build_SslCredentialsWithHttp_ThrowsError()
         {

test/Grpc.Net.ClientFactory.Tests/DefaultGrpcClientFactoryTests.cs

@@ -42,6 +42,27 @@ namespace Grpc.AspNetCore.Server.ClientFactory.Tests
     [TestFixture]
     public class DefaultGrpcClientFactoryTests
     {
+        [Test]
+        public void CreateClient_Default_InternalHttpClientHasInfiniteTimeout()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            services
+                .AddGrpcClient<TestGreeterClient>(o => o.Address = new Uri("http://localhost"));
+
+            var serviceProvider = services.BuildServiceProvider(validateScopes: true);
+
+            var clientFactory = new DefaultGrpcClientFactory(
+                serviceProvider,
+                serviceProvider.GetRequiredService<IHttpClientFactory>());
+
+            // Act
+            var client = clientFactory.CreateClient<TestGreeterClient>(nameof(TestGreeterClient));
+
+            // Assert
+            Assert.AreEqual(Timeout.InfiniteTimeSpan, client.CallInvoker.Channel.HttpClient.Timeout);
+        }
+
         [Test]
         public void CreateClient_MatchingConfigurationBasedOnTypeName_ReturnConfiguration()
         {