[Service Bus] Handle cases where desired worker count exceeds int.Max…

…Int (Azure#39474) * handle long desired worker count * adding additional unit test * handle overflow * Revert "adding additional unit test" This reverts commit a0869c4. * Revert "handle overflow" This reverts commit dba0661. * Revert "Revert "handle overflow"" This reverts commit bd6bd1d. * Revert "handle long desired worker count" This reverts commit e5a8756. * add checked block --------- Co-authored-by: Vincent Chiang <vchiang@microsoft.com>
matthohn-msft · Oct 27, 2023 · 29fb1fe · 29fb1fe
1 parent 6eecd53
commit 29fb1fe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/...bus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusTargetScaler.cs b/...bus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusTargetScaler.cs
@@ -94,7 +94,20 @@ internal TargetScalerResult GetScaleResultInternal(TargetScalerContext context,
                 throw new ArgumentOutOfRangeException($"Unexpected concurrency='{concurrency}' - the value must be > 0.");
             }
 
-            int targetWorkerCount = (int)Math.Ceiling(messageCount / (decimal)concurrency);
+            int targetWorkerCount;
+
+            try
+            {
+                checked
+                {
+                    targetWorkerCount = (int)Math.Ceiling(messageCount / (decimal)concurrency);
+                }
+            }
+            catch (OverflowException)
+            {
+                targetWorkerCount = int.MaxValue;
+            }
+
             _logger.LogInformation($"Target worker count for function '{_functionId}' is '{targetWorkerCount}' (EntityPath='{_entityPath}', MessageCount ='{messageCount}', Concurrency='{concurrency}').");
 
             return new TargetScalerResult

diff --git a/...rosoft.Azure.WebJobs.Extensions.ServiceBus/tests/Listeners/ServiceBusTargetScalerTests.cs b/...rosoft.Azure.WebJobs.Extensions.ServiceBus/tests/Listeners/ServiceBusTargetScalerTests.cs
@@ -27,7 +27,10 @@ public void Setup()
         [TestCase(100, true, true, null, 4)]
         [TestCase(100, false, true, 19, 6)]
         [TestCase(100, false, false, null, 3)]
-        public void ServiceBusTargetScaler_Returns_Expected(int messageCount, bool isSessionEnabled, bool singleDispatch, int? concurrency,int expected)
+        [TestCase(100, false, false, null, 3)]
+        [TestCase(2147483650, false, false, 1, 2147483647)] // cap targetWorkerCount at int.MaxValue
+        [TestCase(2147483650, false, false, 2, 1073741825)]
+        public void ServiceBusTargetScaler_Returns_Expected(long messageCount, bool isSessionEnabled, bool singleDispatch, int? concurrency, int expected)
         {
             ServiceBusOptions options = new ServiceBusOptions
             {