Skip to content

Commit 0745606

Browse files
authored
Merge pull request #96840 from alexkarcher-msft/PlanSwitching
Plan switching and "unbounded"
2 parents a6bb0f1 + e0d02e9 commit 0745606

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

articles/azure-functions/functions-host-json.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ A list of functions that the job host runs. An empty array means run all functio
149149
## functionTimeout
150150

151151
Indicates the timeout duration for all functions. It follows the timespan string format. In a serverless Consumption plan, the valid range is from 1 second to 10 minutes, and the default value is 5 minutes.
152+
153+
In the Premium plan the valid range is from 1 second to 60 minutes, and the default value is 30 minutes.
154+
152155
In a Dedicated (App Service) plan, there is no overall limit, and the default value is 30 minutes. A value of `-1` indicates unbounded execution, but keeping a fixed upper bound is recommended.
153156

154157
```json

articles/azure-functions/functions-premium-plan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ Fore more information, see [integrate your function app with a VNet](functions-c
5959

6060
Additional compute instances are automatically added for your app using the same rapid scaling logic as the Consumption plan. To learn more about how scaling works, see [Function scale and hosting](./functions-scale.md#how-the-consumption-and-premium-plans-work).
6161

62-
### Unbounded run duration
62+
### Longer run duration
6363

64-
Azure Functions in a Consumption plan are limited to 10 minutes for a single execution. In the Premium plan, the run duration defaults to 30 minutes to prevent runaway executions. However, you can [modify the host.json configuration](./functions-host-json.md#functiontimeout) to make this unbounded for Premium plan apps.
64+
Azure Functions in a Consumption plan are limited to 10 minutes for a single execution. In the Premium plan, the run duration defaults to 30 minutes to prevent runaway executions. However, you can [modify the host.json configuration](./functions-host-json.md#functiontimeout) to make this 60 minutes for Premium plan apps.
6565

6666
## Plan and SKU settings
6767

articles/azure-functions/functions-scale.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ Premium plan provides additional features, such as premium compute instances, th
2424

2525
App Service plan allows you to take advantage of dedicated infrastructure, which you manage. Your function app doesn't scale based on events, which means is never scales down to zero. (Requires that [Always on](#always-on) is enabled.)
2626

27-
> [!NOTE]
28-
> You can switch between Consumption and Premium plans by changing the plan property of the function app resource.
29-
3027
## Hosting plan support
3128

3229
Feature support falls into the following two categories:

includes/functions-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ ms.author: glenga
88
| Resource | [Consumption plan](../articles/azure-functions/functions-scale.md#consumption-plan) | [Premium plan](../articles/azure-functions/functions-scale.md#premium-plan) | [App Service plan](../articles/azure-functions/functions-scale.md#app-service-plan)<sup>1</sup> |
99
| --- | --- | --- | --- |
1010
| Scale out | Event driven | Event driven | [Manual/autoscale](../articles/app-service/manage-scale-up.md) |
11-
| Max instances | 200 | 20 | 10-20 |
11+
| Max instances | 200 | 100 | 10-20 |
1212
|Default [time out duration](../articles/azure-functions/functions-scale.md#timeout) (min) |5 | 30 |30<sup>2</sup> |
13-
|Max [time out duration](../articles/azure-functions/functions-scale.md#timeout) (min) |10 | unbounded | unbounded<sup>3</sup> |
13+
|Max [time out duration](../articles/azure-functions/functions-scale.md#timeout) (min) |10 | 60 | unbounded<sup>3</sup> |
1414
| Max outbound connections (per instance) | 600 active (1200 total) | unbounded | unbounded |
1515
| Max request size (MB)<sup>4</sup> | 100 | 100 | 100 |
1616
| Max query string length<sup>4</sup> | 4096 | 4096 | 4096 |

0 commit comments

Comments
 (0)