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

[Event Hubs] Handle cases where desired worker count exceeds int.MaxInt #39468

Merged
merged 18 commits into from
Oct 26, 2023
Merged

[Event Hubs] Handle cases where desired worker count exceeds int.MaxInt #39468

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 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
6acb4cd
use checked approach
Oct 24, 2023
95f1243
remove unncessary cast
Oct 24, 2023
4c2faca
add unit test
Oct 24, 2023
8237d21
update comment
Oct 24, 2023
c7fb27a
add unit tests
Oct 24, 2023
20811f1
fix merge conflicts
Oct 25, 2023
3d28bbc
Merge branch 'Azure:main' into user/vchiang/handleLongDesiredWorkerCount
chiangvincent Oct 25, 2023
093a1c2
handle long desired worker count
Oct 24, 2023
249e9fa
adding additional unit test
Oct 24, 2023
89262fc
use checked approach
Oct 24, 2023
b1adcb3
remove unncessary cast
Oct 24, 2023
50dc031
add unit test
Oct 24, 2023
49500f4
update comment
Oct 24, 2023
424658d
fix merge conflict
Oct 25, 2023
c23a6d7
Merge branch 'user/vchiang/handleLongDesiredWorkerCount' of https://g…
Oct 25, 2023
e15c310
fix concurrency in unit tests
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: 9 additions & 3 deletions ...nthub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Listeners/EventHubsTargetScaler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ internal static TargetScalerResult ThrottleScaleDownIfNecessaryInternal(TargetSc
internal TargetScalerResult GetScaleResultInternal(TargetScalerContext context, long eventCount, int partitionCount)
{
int desiredConcurrency = GetDesiredConcurrencyInternal(context);
int desiredWorkerCount = (int)Math.Ceiling(eventCount / (decimal)desiredConcurrency);
long desiredWorkerCount = (long)Math.Ceiling(eventCount / (decimal)desiredConcurrency);
chiangvincent marked this conversation as resolved.
Show resolved Hide resolved
int[] sortedValidWorkerCounts = GetSortedValidWorkerCountsForPartitionCount(partitionCount);
int validatedTargetWorkerCount = GetValidWorkerCount(desiredWorkerCount, sortedValidWorkerCounts);

Expand Down Expand Up @@ -163,9 +163,15 @@ internal static int[] GetSortedValidWorkerCountsForPartitionCount(int partitionC
/// <param name="workerCount">The value that we want to find in the sortedValues list (if it exists), or the next largest element.</param>
/// <param name="sortedValidWorkerCountList">The list of valid worker counts. This must be sorted.</param>
/// <returns></returns>
internal static int GetValidWorkerCount(int workerCount, int[] sortedValidWorkerCountList)
internal static int GetValidWorkerCount(long workerCount, int[] sortedValidWorkerCountList)
{
int i = Array.BinarySearch(sortedValidWorkerCountList, workerCount);
// Handling cases where workerCount exceeds int.MaxInt
if (workerCount > int.MaxValue)
{
return sortedValidWorkerCountList.Last();
}

int i = Array.BinarySearch(sortedValidWorkerCountList, (int)workerCount);
if (i >= 0)
{
return sortedValidWorkerCountList[i];
Expand Down
4 changes: 3 additions & 1 deletion ...eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubsTargetScalerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ public void TestGetSortedValidWorkerCountsForPartitionCount(int partitionCount,
[TestCase(21, new[] { 1, 4, 10, 20 }, 20)]
[TestCase(0, new[] { 1, 4, 10, 20 }, 1)]
[TestCase(10, new[] { 1, 4, 10, 20 }, 10)]
public void GetSortedValidWorkerCountsForPartitionCount_ReturnsExpected(int workerCount, int[] sortedWorkerCountList, int expectedValidWorkerCount)
[TestCase(2147483650, new[] { 1, 4, 10, 20 }, 20)] // workerCount exceeds MaxInt
[TestCase(2147483650, new[] { 1 }, 1)]
public void GetSortedValidWorkerCountsForPartitionCount_ReturnsExpected(long workerCount, int[] sortedWorkerCountList, int expectedValidWorkerCount)
{
int actualValidWorkerCount = EventHubsTargetScaler.GetValidWorkerCount(workerCount, sortedWorkerCountList);
Assert.AreEqual(expectedValidWorkerCount, actualValidWorkerCount);
Expand Down
Loading