Skip to content

Commit 021368b

Browse files
authored
[BUG] GetProcessorCount for webjobs service bus extension does not override processor count for flex consumption (Fixes #45970) (#46197)
* [BUG] GetProcessorCount for webjobs service bus extension does not override processor count for flex consumption #45970 (Fixes #45970) * Adding bug description * Adding UtilityTest * Chasngelog
1 parent 748cfb5 commit 021368b

File tree

4 files changed

+29
-1
lines changed

4 files changed

+29
-1
lines changed

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
### Breaking Changes
88

99
### Bugs Fixed
10+
GetProcessorCount for webjobs service bus extension does not override processor count for flex consumption. (#45970)
1011

1112
### Other Changes
1213

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Constants.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ internal static class Constants
88
public const string DefaultConnectionStringName = "ServiceBus";
99
public const string DefaultConnectionSettingStringName = "AzureWebJobsServiceBus";
1010
public const string DynamicSku = "Dynamic";
11+
public const string FlexConsumptionSku = "FlexConsumption";
1112
public const string AzureWebsiteSku = "WEBSITE_SKU";
1213
public const string ProcessMessagesActivityName = "ServiceBusListener.ProcessMessages";
1314
public const string ProcessSessionMessagesActivityName = "ServiceBusListener.ProcessSessionMessages";

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Utility.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ internal class Utility
1414
public static int GetProcessorCount()
1515
{
1616
string skuValue = Environment.GetEnvironmentVariable(Constants.AzureWebsiteSku);
17-
return string.Equals(skuValue, Constants.DynamicSku, StringComparison.OrdinalIgnoreCase) ? 1 : Environment.ProcessorCount;
17+
return string.Equals(skuValue, Constants.DynamicSku, StringComparison.OrdinalIgnoreCase) || string.Equals(skuValue, Constants.FlexConsumptionSku, StringComparison.OrdinalIgnoreCase)
18+
? 1 : Environment.ProcessorCount;
1819
}
1920
}
2021
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the MIT License. See License.txt in the project root for license information.
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using NUnit.Framework;
10+
11+
namespace Microsoft.Azure.WebJobs.ServiceBus.UnitTests
12+
{
13+
internal class UtilityTest
14+
{
15+
[Test]
16+
public void GetProcessorCount_ReturnsOneForDynamicAndFlexSkus()
17+
{
18+
Environment.SetEnvironmentVariable(Constants.AzureWebsiteSku, Constants.DynamicSku);
19+
Assert.AreEqual(1, Utility.GetProcessorCount());
20+
21+
Environment.SetEnvironmentVariable(Constants.AzureWebsiteSku, Constants.FlexConsumptionSku);
22+
Assert.AreEqual(1, Utility.GetProcessorCount());
23+
}
24+
}
25+
}

0 commit comments

Comments
 (0)