Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fresh2

Author: HeidiSteen

articles/data-factory/author-global-parameters.md

@@ -6,7 +6,7 @@ ms.subservice: authoring
 ms.topic: conceptual
 author: joshuha-msft
 ms.author: joowen
-ms.date: 05/12/2021 
+ms.date: 01/31/2022
 ms.custom: devx-track-azurepowershell
 ---
 
@@ -30,6 +30,8 @@ After a global parameter is created, you can edit it by clicking the parameter's
 
 :::image type="content" source="media/author-global-parameters/create-global-parameter-3.png" alt-text="Create global parameters":::
 
+Global parameters are stored as part of the /factory/{factory_name}-arm-template parameters.json.
+
 ## Using global parameters in a pipeline
 
 Global parameters can be used in any [pipeline expression](control-flow-expression-language-functions.md). If a pipeline is referencing another resource such as a dataset or data flow, you can pass down the global parameter value via that resource's parameters. Global parameters are referenced as `pipeline().globalParameters.<parameterName>`.
@@ -93,7 +95,8 @@ $globalParametersJson = Get-Content $globalParametersFilePath
 Write-Host "Parsing JSON..."
 $globalParametersObject = [Newtonsoft.Json.Linq.JObject]::Parse($globalParametersJson)
 
-foreach ($gp in $globalParametersObject.GetEnumerator()) {
+foreach ($gp in $factoryFileObject.properties.globalParameters.GetEnumerator()) {
+ # foreach ($gp in $globalParametersObject.GetEnumerator()) {
     Write-Host "Adding global parameter:" $gp.Key
     $globalParameterValue = $gp.Value.ToObject([Microsoft.Azure.Management.DataFactory.Models.GlobalParameterSpecification])
     $newGlobalParameters.Add($gp.Key, $globalParameterValue)

articles/data-factory/data-factory-troubleshoot-guide.md

@@ -7,7 +7,7 @@ ms.service: data-factory
 ms.subservice: troubleshooting
 ms.custom: synapse
 ms.topic: troubleshooting
-ms.date: 09/30/2021
+ms.date: 01/28/2022
 ms.author: abnarain
 ---
 
@@ -1021,6 +1021,15 @@ For more information, see [Getting started with Fiddler](https://docs.telerik.co
 
 ## General
 
+### REST continuation token NULL error 
+
+**Error message:** {\"token\":null,\"range\":{\"min\":\..}
+
+**Cause:** When querying across multiple partitions/pages, backend service  returns continuation token in JObject format with 3 properties: **token, min and max key ranges**,  for instance, {\"token\":null,\"range\":{\"min\":\"05C1E9AB0DAD76\",\"max":\"05C1E9CD673398"}}). Depending on source data, querying can result 0 indicating missing token though there is more data to fetch.
+
+**Recommendation:** When the continuationToken is non-null, as the string {\"token\":null,\"range\":{\"min\":\"05C1E9AB0DAD76\",\"max":\"05C1E9CD673398"}}, it is required  to call queryActivityRuns API again with the continuation token from the previous response. You need to pass the full string for the query API again. The activities will be returned in the subsequent pages for the query result. You should ignore that there is empty array in this page, as long as the full continuationToken value != null, you need continue querying. For more details, please refer to [REST api for pipeline run query.](/rest/api/datafactory/activity-runs/query-by-pipeline-run) 
+
+
 ### Activity stuck issue
 
 When you observe that the activity is running much longer than your normal runs with barely no progress, it may happen to be stuck. You can try canceling it and retry to see if it helps. If it's a copy activity, you can learn about the performance monitoring and troubleshooting from [Troubleshoot copy activity performance](copy-activity-performance-troubleshooting.md); if it's a data flow, learn from [Mapping data flows performance](concepts-data-flow-performance.md) and tuning guide.
@@ -1051,4 +1060,4 @@ For more troubleshooting help, try these resources:
 * [Stack Overflow forum for Data Factory](https://stackoverflow.com/questions/tagged/azure-data-factory)
 * [Twitter information about Data Factory](https://twitter.com/hashtag/DataFactory)
 * [Azure videos](https://azure.microsoft.com/resources/videos/index/)
-* [Microsoft Q&A question page](/answers/topics/azure-data-factory.html)
+* [Microsoft Q&A question page](/answers/topics/azure-data-factory.html)

articles/data-factory/data-flow-troubleshoot-errors.md

@@ -7,7 +7,7 @@ ms.reviewer: daperlov
 ms.service: data-factory
 ms.subservice: data-flows
 ms.topic: troubleshooting
-ms.date: 10/01/2021
+ms.date: 01/21/2022
 ---
 
 # Common error codes and messages 
@@ -33,7 +33,7 @@ This article lists common error codes and messages reported by mapping data flow
 
   If you're running the data flow in a debug test execution from a debug pipeline run, you might run into this condition more frequently. That's because Azure Data Factory throttles the broadcast timeout to 60 seconds to maintain a faster debugging experience. You can extend the timeout to the 300-second timeout of a triggered run. To do so, you can use the **Debug** > **Use Activity Runtime** option to use the Azure IR defined in your Execute Data Flow pipeline activity.
 
-- **Message**: Broadcast join timeout error, you can choose 'Off' of broadcast option in join/exists/lookup transformation to avoid this issue. If you intend to broadcast join option to improve performance then make sure broadcast stream can produce data within 60 secs in debug runs and 300 secs in job runs.
+- **Message**: Broadcast join timeout error, you can choose 'Off' of broadcast option in join/exists/lookup transformation to avoid this issue. If you intend to broadcast join option to improve performance, then make sure broadcast stream can produce data within 60 secs in debug runs and 300 secs in job runs.
 - **Cause**: Broadcast has a default timeout of 60 seconds in debug runs and 300 seconds in job runs. On the broadcast join, the stream chosen for broadcast is too large to produce data within this limit. If a broadcast join isn't used, the default broadcast by dataflow can reach the same limit.
 - **Recommendation**: Turn off the broadcast option or avoid broadcasting large data streams for which the processing can take more than 60 seconds. Choose a smaller stream to broadcast. Large Azure SQL Data Warehouse tables and source files aren't typically good choices. In the absence of a broadcast join, use a larger cluster if this error occurs.
 
@@ -49,7 +49,7 @@ This article lists common error codes and messages reported by mapping data flow
 - **Recommendation**: Set an alias if you're using a SQL function like min() or max().
 
 ## Error code: DF-Executor-DriverError
-- **Message**: INT96 is legacy timestamp type which is not supported by ADF Dataflow. Please consider upgrading the column type to the latest types.
+- **Message**: INT96 is legacy timestamp type, which is not supported by ADF Dataflow. Please consider upgrading the column type to the latest types.
 - **Cause**: Driver error.
 - **Recommendation**: INT96 is a legacy timestamp type that's not supported by Azure Data Factory data flow. Consider upgrading the column type to the latest type.
 
@@ -59,7 +59,7 @@ This article lists common error codes and messages reported by mapping data flow
 - **Recommendation**: Contact the Microsoft product team for more details about this problem.
 
 ## Error code: DF-Executor-PartitionDirectoryError
-- **Message**: The specified source path has either multiple partitioned directories (for e.g. &lt;Source Path&gt;/<Partition Root Directory 1>/a=10/b=20, &lt;Source Path&gt;/&lt;Partition Root Directory 2&gt;/c=10/d=30) or partitioned directory with other file or non-partitioned directory (for example &lt;Source Path&gt;/&lt;Partition Root Directory 1&gt;/a=10/b=20, &lt;Source Path&gt;/Directory 2/file1), remove partition root directory from source path and read it through separate source transformation.
+- **Message**: The specified source path has either multiple partitioned directories (for example, &lt;Source Path&gt;/<Partition Root Directory 1>/a=10/b=20, &lt;Source Path&gt;/&lt;Partition Root Directory 2&gt;/c=10/d=30) or partitioned directory with other file or non-partitioned directory (for example &lt;Source Path&gt;/&lt;Partition Root Directory 1&gt;/a=10/b=20, &lt;Source Path&gt;/Directory 2/file1), remove partition root directory from source path and read it through separate source transformation.
 - **Cause**: The source path has either multiple partitioned directories or a partitioned directory that has another file or non-partitioned directory.
 - **Recommendation**: Remove the partitioned root directory from the source path and read it through separate source transformation.
 
@@ -125,7 +125,7 @@ This article lists common error codes and messages reported by mapping data flow
 ## Error code: InvalidTemplate
 - **Message**: The pipeline expression cannot be evaluated.
 - **Cause**: The pipeline expression passed in the Data Flow activity isn't being processed correctly because of a syntax error.
-- **Recommendation**: Check your activity in activity monitoring to verify the expression.
+- **Recommendation**: Check data flow activity name. Check expressions in activity monitoring to verify the expressions. For example, data flow activity name can not have a space or a hyphen.
 
 ## Error code: 2011
 - **Message**: The activity was running on Azure Integration Runtime and failed to decrypt the credential of data store or compute connected via a Self-hosted Integration Runtime. Please check the configuration of linked services associated with this activity, and make sure to use the proper integration runtime type.
@@ -248,7 +248,7 @@ This article lists common error codes and messages reported by mapping data flow
 ## Error code: DF-Hive-InvalidBlobStagingConfiguration
 - **Message**: Blob storage staging properties should be specified.
 - **Cause**: An invalid staging configuration is provided in the Hive.
-- **Recommendation**: Please check if the account key, account name and container are set properly in the related Blob linked service which is used as staging.
+- **Recommendation**: Please check if the account key, account name and container are set properly in the related Blob linked service, which is used as staging.
 
 ## Error code: DF-Hive-InvalidGen2StagingConfiguration
 - **Message**: ADLS Gen2 storage staging only support service principal key credential.
@@ -567,4 +567,4 @@ For more help with troubleshooting, see these resources:
 - [Data Factory feature requests](/answers/topics/azure-data-factory.html)
 - [Azure videos](https://azure.microsoft.com/resources/videos/index/?sort=newest&services=data-factory)
 - [Stack Overflow forum for Data Factory](https://stackoverflow.com/questions/tagged/azure-data-factory)
-- [Twitter information about Data Factory](https://twitter.com/hashtag/DataFactory)
+- [Twitter information about Data Factory](https://twitter.com/hashtag/DataFactory)