Merge pull request #1047 from aksio-insurtech:fix/max-parallelism

Fix/max-parallelism
Cratis · Dec 12, 2023 · 802168f · 802168f
2 parents e87e6b3 + bf0b623
commit 802168f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/Source/Kernel/Grains/Workers/InvalidMaximumConcurrencyLevel.cs b/Source/Kernel/Grains/Workers/InvalidMaximumConcurrencyLevel.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Aksio Insurtech. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Aksio.Cratis.Kernel.Grains.Workers;
+
+/// <summary>
+/// Exception that gets thrown when the maximum concurrency level is invalid.
+/// </summary>
+public class InvalidMaximumConcurrencyLevel : Exception
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="InvalidMaximumConcurrencyLevel"/> class.
+    /// </summary>
+    /// <param name="maxDegreeOfParallelism">The degree of parallelism configured.</param>
+    public InvalidMaximumConcurrencyLevel(int maxDegreeOfParallelism)
+        : base($"Invalid maximum concurrency level: {maxDegreeOfParallelism}. Must be at least 1.")
+    {
+    }
+}
diff --git a/Source/Kernel/Grains/Workers/LimitedConcurrencyLevelTaskScheduler.cs b/Source/Kernel/Grains/Workers/LimitedConcurrencyLevelTaskScheduler.cs
@@ -26,7 +26,7 @@ public class LimitedConcurrencyLevelTaskScheduler : TaskScheduler
     /// <param name="maxDegreeOfParallelism">The maximum degree of parallelism provided by this scheduler.</param>
     public LimitedConcurrencyLevelTaskScheduler(int maxDegreeOfParallelism)
     {
-        if (maxDegreeOfParallelism < 1) throw new ArgumentOutOfRangeException(nameof(maxDegreeOfParallelism));
+        if (maxDegreeOfParallelism < 1) throw new InvalidMaximumConcurrencyLevel(maxDegreeOfParallelism);
         _maxDegreeOfParallelism = maxDegreeOfParallelism;
     }
 

diff --git a/Source/Kernel/Server/CpuBoundWorkersExtensions.cs b/Source/Kernel/Server/CpuBoundWorkersExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Aksio.Cratis.Kernel.Grains.Workers;
+using Serilog;
 
 #pragma warning disable SA1600
 namespace Aksio.Cratis.Kernel.Server;
@@ -18,11 +19,16 @@ public static class CpuBoundWorkersExtensions
     /// <returns><see cref="ISiloBuilder"/> for continuation.</returns>
     public static IHostBuilder ConfigureCpuBoundWorkers(this IHostBuilder builder)
     {
+        Log.Logger.Information("Configuring Cpu bound workers");
+
         var maxLevelOfParallelism = Environment.ProcessorCount - 2;
-        if (maxLevelOfParallelism < 0)
+        if (maxLevelOfParallelism <= 0)
         {
             maxLevelOfParallelism = 1;
         }
+
+        Log.Logger.Information("Max level of parallelism for Cpu bound workers: {MaxLevelOfParallelism} - number of processor count {ProcessorCount}", maxLevelOfParallelism, Environment.ProcessorCount);
+
         builder.ConfigureServices((services) => services.AddSingleton(new LimitedConcurrencyLevelTaskScheduler(maxLevelOfParallelism)));
 
         return builder;