[RPC]Fix FunctionLoadTimeout (Azure#6935)

azArchJ · Nov 24, 2020 · a1a90db · a1a90db
1 parent 4342df9
commit a1a90db
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs b/src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs
@@ -59,7 +59,7 @@ internal class GrpcWorkerChannel : IRpcWorkerChannel, IDisposable
         private IWorkerProcess _rpcWorkerProcess;
         private TaskCompletionSource<bool> _reloadTask = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
         private TaskCompletionSource<bool> _workerInitTask = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-        private TimeSpan functionLoadTimeout = TimeSpan.FromMinutes(10);
+        private TimeSpan _functionLoadTimeout = TimeSpan.FromMinutes(10);
 
         internal GrpcWorkerChannel(
            string workerId,
@@ -259,9 +259,10 @@ public void SendFunctionLoadRequests(ManagedDependencyOptions managedDependencyO
             {
                 if (functionTimeout.HasValue)
                 {
-                    functionLoadTimeout = functionTimeout.Value > functionLoadTimeout ? functionTimeout.Value : functionLoadTimeout;
+                    _functionLoadTimeout = functionTimeout.Value > _functionLoadTimeout ? functionTimeout.Value : _functionLoadTimeout;
                     _eventSubscriptions.Add(_inboundWorkerEvents.Where(msg => msg.MessageType == MsgType.FunctionLoadResponse)
-                        .Timeout(functionLoadTimeout)
+                        .Timeout(_functionLoadTimeout)
+                        .Take(_functions.Count())
                         .Subscribe((msg) => LoadResponse(msg.Message.FunctionLoadResponse), HandleWorkerFunctionLoadError));
                 }
                 else