From bd6bd1d28fc30fb55fe2972cee60aedfcc008821 Mon Sep 17 00:00:00 2001 From: Vincent Chiang Date: Tue, 24 Oct 2023 13:58:37 -0400 Subject: [PATCH] Revert "handle overflow" This reverts commit dba066189f252936a2d21e0d7406cab95e089358. --- .../src/Listeners/ServiceBusTargetScaler.cs | 12 +----------- .../tests/Listeners/ServiceBusTargetScalerTests.cs | 5 +---- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusTargetScaler.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusTargetScaler.cs index ea2246b62149..eda2f1092df9 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusTargetScaler.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusTargetScaler.cs @@ -94,17 +94,7 @@ internal TargetScalerResult GetScaleResultInternal(TargetScalerContext context, throw new ArgumentOutOfRangeException($"Unexpected concurrency='{concurrency}' - the value must be > 0."); } - int targetWorkerCount; - - try - { - targetWorkerCount = (int)Math.Ceiling(messageCount / (decimal)concurrency); - } - catch (OverflowException) - { - targetWorkerCount = int.MaxValue; - } - + int targetWorkerCount = (int)Math.Ceiling(messageCount / (decimal)concurrency); _logger.LogInformation($"Target worker count for function '{_functionId}' is '{targetWorkerCount}' (EntityPath='{_entityPath}', MessageCount ='{messageCount}', Concurrency='{concurrency}')."); return new TargetScalerResult diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/Listeners/ServiceBusTargetScalerTests.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/Listeners/ServiceBusTargetScalerTests.cs index e749def9f961..567d5a5e975a 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/Listeners/ServiceBusTargetScalerTests.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/Listeners/ServiceBusTargetScalerTests.cs @@ -27,10 +27,7 @@ public void Setup() [TestCase(100, true, true, null, 4)] [TestCase(100, false, true, 19, 6)] [TestCase(100, false, false, null, 3)] - [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) + public void ServiceBusTargetScaler_Returns_Expected(int messageCount, bool isSessionEnabled, bool singleDispatch, int? concurrency,int expected) { ServiceBusOptions options = new ServiceBusOptions {