Merge pull request #233410 from chez-charlie/release-branch-1

Try Catch block for ADF

Author: American-Dipper

articles/data-factory/media/tutorial-pipeline-failure-error-handling/conditional-complex-2.png

@@ -27,7 +27,7 @@ Azure Data Factory and Synapse Pipeline orchestration allows conditional logic a
 
 :::image type="content" source="media/tutorial-pipeline-failure-error-handling/pipeline-error-1-four-branches.png" alt-text="Screenshot showing the four branches out of an activity.":::
 
-You may add multiple branches following an activity, with one exception: _Upon Completion_ path can't co-exist with either _Upon Success_ or _Upon Failure_ path. For each pipeline run, at most one path will be activated, based on the execution outcome of the activity.
+You may add multiple branches following an activity, with one exception: _Upon Completion_ path can't coexist with either _Upon Success_ or _Upon Failure_ path. For each pipeline run, at most one path is activated, based on the execution outcome of the activity.
 
 ## Error Handling
 
@@ -61,7 +61,7 @@ Approach | Defines | When activity succeeds, overall pipeline shows | When activ
 
 ### How pipeline failure are determined
 
-Different error handling mechanisms will lead to different status for the pipeline: while some pipelines fail, others succeed. We determine pipeline success and failures as follows:
+Different error handling mechanisms lead to different status for the pipeline: while some pipelines fail, others succeed. We determine pipeline success and failures as follows:
 
 * Evaluate outcome for all leaves activities. If a leaf activity was skipped, we evaluate its parent activity instead
 * Pipeline result is success if and only if all nodes evaluated succeed
@@ -115,15 +115,15 @@ Here, the follow-up wait activity will only execute when both web activities wer
 
 :::image type="content" source="media/tutorial-pipeline-failure-error-handling/conditional-and-1.png" alt-text="Screenshot showcasing pipeline proceeds only if both web activities succeed.":::
 
-And here, the follow-up wait activity will execute when _ActivitySucceeded_ passes and _ActivityFailed_ completed. Note, with "Upon Success" path  _ActivitySucceeded_ has to succeed, whereas _ActivityFailed_ on the "Upon Completion" path runs with best effort, that is, may fail.
+And here, the follow-up wait activity executes when _ActivitySucceeded_ passes and _ActivityFailed_ completed. Note, with "Upon Success" path  _ActivitySucceeded_ has to succeed, whereas _ActivityFailed_ on the "Upon Completion" path runs with best effort, that is, may fail.
 
 
 :::image type="content" source="media/tutorial-pipeline-failure-error-handling/conditional-and-2.png" alt-text="Screenshot showcasing pipeline proceeds when first web activity succeeds and second web activity completes.":::
 
 ### Or
 Second common scenarios are conditional "or": run an activity if any of the dependencies succeeds or fails. Here we need to use "Upon Completion" paths, [If Condition activity](control-flow-if-condition-activity.md) and [expression language](control-flow-expression-language-functions.md).
 
-Before we dive deep into code, we need to understand one more thing. After an activity ran and completed, you may reference its status with _@activity('ActivityName').Status_. It will be either _"Succeeded"_ or _"Failed"_. We'll use this property to build conditional or logic.
+Before we dive deep into code, we need to understand one more thing. After an activity ran and completed, you may reference its status with _@activity('ActivityName').Status_. It's either "Succeeded"_ or _"Failed"_. We use this property to build conditional or logic.
 
 #### Shared error handling logging step
 In some cases, you may want to invoke a shared error handling or logging step, if any of the previous activities failed. You can build your pipeline like this:
@@ -134,7 +134,7 @@ In some cases, you may want to invoke a shared error handling or logging step, i
 ```json
 @or(equals(activity('ActivityFailed').Status, 'Failed'), equals(activity('ActivitySucceeded').Status, 'Failed'))
 ```
-* Note: you'll need concatenated or if you've more than two dependency activities, for instance, 
+* Note: you need concatenated or if you've more than two dependency activities, for instance, 
 ```json
 @or(or(equals(activity('ActivityFailed').Status, 'Failed'), equals(activity('ActivitySucceeded1').Status, 'Failed')),equals(activity('ActivitySucceeded1').Status, 'Failed'))
 ```
@@ -150,7 +150,7 @@ When all your activities are best effort, you may want to proceed to next step i
 ```json
 @or(equals(activity('ActivityFailed').Status, 'Succeeded'), equals(activity('ActivitySucceeded').Status, 'Succeeded'))
 ```
-* Note: the graph will look exactly like the previous scenario. The only difference is the expression language used
+* Note: the graph looks exactly like the previous scenario. The only difference is the expression language used
 
 :::image type="content" source="media/tutorial-pipeline-failure-error-handling/conditional-or-2.png" alt-text="Screenshot showcasing pipeline proceeds to next step if any of the activities pass.":::
 
@@ -168,18 +168,13 @@ The pattern is a combination of two: conditional and + error handling. The pipel
 :::image type="content" source="media/tutorial-pipeline-failure-error-handling/conditional-complex-1.png" alt-text="Screenshot showcasing pipeline proceeds to next step if any of the activities pass, or else runs error handling code.":::
 
 
-#### Try-Catch-Proceed 
-The pattern is equivalent to try catch block in coding. It states that if either the activity or the error handling code succeeds, the pipeline should proceed. It's rather complicated and should only be reserved for the most mission critical steps.
-* add the mission critical work step
-* add an error handling activity to the _"Upon Failure"_ path of the main activity
-* add an if condition to contain next steps, in True branch
-* connect _"Upon Completion"_ path of the main activity to the condition activity
-* connect both _"Upon Success"_ and _"Upon Skip"_ paths of the error handling activity to the condition activity
-* logical expression for condition activity reads 
-```json
-@or(equals(activity('ActivityFailed').Status, 'Succeeded'), equals(activity('ErrorHandling').Status, 'Succeeded'))
-```
-* Note the order of expressions: the main activity part has to come first, before the error handling activity part
+### Try-Catch-Proceed 
+The pattern is equivalent to try catch block in coding. It states that if either the activity or the error handling code succeeds, the pipeline should proceed. We've simplified and streamlined the implementation for our customers. Try catch block doesn't need an if block.
+
+* Add first activity
+* Add error handling to the UponFailure path
+* Add second activity, but don't connect to the first activity
+* Connect both UponFailure and UponSkip paths from the error handling activity to the second activity
 
 :::image type="content" source="media/tutorial-pipeline-failure-error-handling/conditional-complex-2.png" alt-text="Screenshot showcasing pipeline with try catch block.":::