Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Service Bus] Handle cases where desired worker count exceeds int.MaxInt #39474

Merged
merged 8 commits into from
Oct 26, 2023
Merged

[Service Bus] Handle cases where desired worker count exceeds int.MaxInt #39474

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5a8756
handle long desired worker count
Oct 24, 2023
a0869c4
adding additional unit test
Oct 24, 2023
dba0661
handle overflow
Oct 24, 2023
2e0be9b
Revert "adding additional unit test"
Oct 24, 2023
bd6bd1d
Revert "handle overflow"
Oct 24, 2023
ecd13c4
Revert "Revert "handle overflow""
Oct 24, 2023
31a9275
Revert "handle long desired worker count"
Oct 24, 2023
fa07eb9
add checked block
Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ...bus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusTargetScaler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,17 @@ 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
jsquire marked this conversation as resolved.
Show resolved Hide resolved
{
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
Expand Down
5 changes: 4 additions & 1 deletion ...rosoft.Azure.WebJobs.Extensions.ServiceBus/tests/Listeners/ServiceBusTargetScalerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down