Changing CompositeListener to start/stop all listeners in parallel. T…

…his improves startup times in general, particularly for Singleton listeners.
kristianhald · Oct 21, 2015 · ddf2acf · ddf2acf
1 parent c15d031
commit ddf2acf
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/Microsoft.Azure.WebJobs.Host/Listeners/CompositeListener.cs b/src/Microsoft.Azure.WebJobs.Host/Listeners/CompositeListener.cs
@@ -28,20 +28,28 @@ public async Task StartAsync(CancellationToken cancellationToken)
         {
             ThrowIfDisposed();
 
+            // start all listeners in parallel
+            List<Task> tasks = new List<Task>();
             foreach (IListener listener in _listeners)
             {
-                await listener.StartAsync(cancellationToken);
+                tasks.Add(listener.StartAsync(cancellationToken));
             }
+
+            await Task.WhenAll(tasks);
         }
 
         public async Task StopAsync(CancellationToken cancellationToken)
         {
             ThrowIfDisposed();
 
+            // stop all listeners in parallel
+            List<Task> tasks = new List<Task>();
             foreach (IListener listener in _listeners)
             {
-                await listener.StopAsync(cancellationToken);
+                tasks.Add(listener.StopAsync(cancellationToken));
             }
+
+            await Task.WhenAll(tasks);
         }
 
         public void Cancel()

diff --git a/test/Microsoft.Azure.WebJobs.Host.UnitTests/Singleton/SingletonConfigurationTests.cs b/test/Microsoft.Azure.WebJobs.Host.UnitTests/Singleton/SingletonConfigurationTests.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using System.Threading;
 using Xunit;
 
 namespace Microsoft.Azure.WebJobs.Host.UnitTests.Singleton
@@ -92,5 +93,28 @@ public void LockAcquisitionTimeout_RangeValidation()
                 Assert.Equal(value, config.LockAcquisitionTimeout);
             }
         }
+
+        [Fact]
+        public void ListenerLockRecoveryPollingInterval_RangeValidation()
+        {
+            SingletonConfiguration config = new SingletonConfiguration();
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                config.ListenerLockRecoveryPollingInterval = TimeSpan.FromMilliseconds(14999);
+            });
+
+            TimeSpan[] validValues = new TimeSpan[]
+            {
+                Timeout.InfiniteTimeSpan,
+                TimeSpan.FromSeconds(15),
+                TimeSpan.FromMinutes(5)
+            };
+            foreach (TimeSpan value in validValues)
+            {
+                config.ListenerLockRecoveryPollingInterval = value;
+                Assert.Equal(value, config.ListenerLockRecoveryPollingInterval);
+            }
+        }
     }
 }