Skip to content

Commit 64bff44

Browse files
authored
Merge pull request #113281 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents e053f00 + 9a0fc4e commit 64bff44

File tree

6 files changed

+31
-15
lines changed

6 files changed

+31
-15
lines changed

articles/active-directory/manage-apps/application-proxy-add-on-premises-application.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@ To use Application Proxy, you need a Windows server running Windows Server 2012
4242
For high availability in your production environment, we recommend having more than one Windows server. For this tutorial, one Windows server is sufficient.
4343

4444
> [!IMPORTANT]
45-
> If you are installing the connector on Windows Server 2019 there is a HTTP2 limitation. A workaround to use the connector on this version is adding the following registry key and restarting the server. Note, this is a machine registry wide key.
46-
```
47-
HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings\WinHttp\EnableDefaultHttp2 (DWORD) Value: 0
48-
```
45+
> If you are installing the connector on Windows Server 2019, you must disable HTTP2 protocol support in the WinHttp component. This is disabled by default in earlier versions of supported operating systems. Adding the following registry key and restarting the server disables it on Windows Server 2019. Note that this is a machine-wide registry key.
46+
>
47+
> ```
48+
> HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings\WinHttp\EnableDefaultHttp2 (DWORD) Value: 0
49+
> ```
50+
>
4951
5052
#### Recommendations for the connector server
5153

articles/key-vault/general/overview-soft-delete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Key Vault's soft-delete feature allows recovery of the deleted vaults and vault
1919

2020
## Supporting interfaces
2121

22-
The soft-delete feature is initially available through the [REST](/rest/api/keyvault/), [CLI](soft-delete-cli.md), [PowerShell](soft-delete-powershell.md) and [.NET/C#](/dotnet/api/microsoft.azure.keyvault?view=azure-dotnet) interfaces.
22+
The soft-delete feature is initially available through the [REST](/rest/api/keyvault/), [CLI](soft-delete-cli.md), [PowerShell](soft-delete-powershell.md), and [.NET/C#](/dotnet/api/microsoft.azure.keyvault?view=azure-dotnet) interfaces, as well as [ARM templates](https://docs.microsoft.com/azure/templates/microsoft.keyvault/2019-09-01/vaults).
2323

2424
## Scenarios
2525

articles/stream-analytics/functions-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ Azure Stream Analytics does not keep a record of all functions invocations and r
4242

4343
Any runtime errors are considered fatal and are surfaced through activity and resource logs. It is recommended that your function handles all exceptions and errors and return a valid result to your query. This will prevent your job from going to a [Failed state](job-states.md).
4444

45+
## Exception handling
46+
47+
Any exception during data processing is considered a catastrophic failure when consuming data in Azure Stream Analytics. User-defined functions have a higher potential to throw exceptions and cause the processing to stop. To avoid this issue, use a *try-catch* block in JavaScript or C# to catch exceptions during code execution. Exceptions that are caught can be logged and treated without causing a system failure. You are encouraged to always wrap your custom code in a *try-catch* block to avoid throwing unexpected exceptions to the processing engine.
4548

4649
## Next steps
4750

4851
* [JavaScript user-defined functions in Azure Stream Analytics](stream-analytics-javascript-user-defined-functions.md)
4952
* [Azure Stream Analytics JavaScript user-defined aggregates](stream-analytics-javascript-user-defined-aggregates.md)
5053
* [Develop .NET Standard user-defined functions for Azure Stream Analytics jobs](stream-analytics-edge-csharp-udf-methods.md)
5154
* [Integrate Azure Stream Analytics with Azure Machine Learning](machine-learning-udf.md)
52-

articles/stream-analytics/stream-analytics-edge-csharp-udf-methods.md

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,29 @@ There are three ways to implement UDFs:
3737
The format of any UDF package has the path `/UserCustomCode/CLR/*`. Dynamic Link Libraries (DLLs) and resources are copied under the `/UserCustomCode/CLR/*` folder, which helps isolate user DLLs from system and Azure Stream Analytics DLLs. This package path is used for all functions regardless of the method used to employ them.
3838

3939
## Supported types and mapping
40+
For Azure Stream Analytics values to be used in C#, they need to be marshaled from one environment to the other. Marshaling happens for all input parameters of a UDF. Every Azure Stream Analytics type has a corresponding type in C# shown on the table below:
4041

41-
|**UDF type (C#)** |**Azure Stream Analytics type** |
42+
|**Azure Stream Analytics type** |**C# type** |
43+
|---------|---------|
44+
|bigint | long |
45+
|float | double |
46+
|nvarchar(max) | string |
47+
|datetime | DateTime |
48+
|Record | Dictionary\<string, object> |
49+
|Array | Array\<object> |
50+
51+
The same is true when data needs to be marshaled from C# to Azure Stream Analytics, which happens on the output value of a UDF. The table below shows what types are supported:
52+
53+
|**C# type** |**Azure Stream Analytics type** |
4254
|---------|---------|
4355
|long | bigint |
44-
|double | double |
56+
|double | float |
4557
|string | nvarchar(max) |
46-
|dateTime | dateTime |
47-
|struct | IRecord |
48-
|object | IRecord |
49-
|Array\<object> | IArray |
50-
|dictionary<string, object> | IRecord |
58+
|DateTime | dateTime |
59+
|struct | Record |
60+
|object | Record |
61+
|Array\<object> | Array |
62+
|Dictionary\<string, object> | Record |
5163

5264
## CodeBehind
5365
You can write user-defined functions in the **Script.asql** CodeBehind. Visual Studio tools will automatically compile the CodeBehind file into an assembly file. The assemblies are packaged as a zip file and uploaded to your storage account when you submit your job to Azure. You can learn how to write a C# UDF using CodeBehind by following the [C# UDF for Stream Analytics Edge jobs](stream-analytics-edge-csharp-udf.md) tutorial.

includes/azure-virtual-machine-scale-sets-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ms.author: cynthn
99
| --- | --- |
1010
| Maximum number of VMs in a scale set |1,000 |
1111
| Maximum number of VMs based on a custom VM image in a scale set|600 |
12-
| Maximum number of scale sets in a region |2,000 |
12+
| Maximum number of scale sets in a region |2,500 |
1313

includes/azure-virtual-machines-limits-azure-resource-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: cynthn
1111
| VM total cores per [subscription](../articles/billing-buy-sign-up-azure-subscription.md) |20<sup>1</sup> per region. Contact support to increase limit. |
1212
| Azure Spot VM total cores per [subscription](../articles/billing-buy-sign-up-azure-subscription.md) |20<sup>1</sup> per region. Contact support to increase limit. |
1313
| VM per series, such as Dv2 and F, cores per [subscription](../articles/billing-buy-sign-up-azure-subscription.md) |20<sup>1</sup> per region. Contact support to increase limit. |
14-
| [Availability sets](../articles/virtual-machines/windows/manage-availability.md#configure-multiple-virtual-machines-in-an-availability-set-for-redundancy) per subscription |2,000 per region. |
14+
| [Availability sets](../articles/virtual-machines/windows/manage-availability.md#configure-multiple-virtual-machines-in-an-availability-set-for-redundancy) per subscription |2,500 per region. |
1515
| Virtual machines per availability set | 200 |
1616
| Certificates per subscription |Unlimited<sup>2</sup> |
1717

0 commit comments

Comments
 (0)