Skip to content

Improve exception handling in AzureDataFactoryTrigger #56350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 6 commits into from
Oct 13, 2025
Merged

Improve exception handling in AzureDataFactoryTrigger #56350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46254a3
fix: don't wrap exception in AirflowException
m1racoli Oct 2, 2025
789d513
fix: do log the actual exception in the trigger
m1racoli Oct 2, 2025
dc2d629
fix: don't override original exception when cancelling ADF pipeline run
m1racoli Oct 2, 2025
3dec53c
Update providers/microsoft/azure/src/airflow/providers/microsoft/azur…
m1racoli Oct 3, 2025
5438f35
Merge branch 'main' into adf-trigger-exception-handling
m1racoli Oct 3, 2025
56bb671
refactor: remove unused exception
m1racoli Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,4 @@ async def cancel_pipeline_run(
:param config: Extra parameters for the ADF client.
"""
client = await self.get_async_conn()
try:
await client.pipeline_runs.cancel(resource_group_name, factory_name, run_id)
except Exception as e:
raise AirflowException(e)
await client.pipeline_runs.cancel(resource_group_name, factory_name, run_id)
7 changes: 4 additions & 3 deletions providers/microsoft/azure/src/airflow/providers/microsoft/azure/triggers/data_factory.py
View file
Open in desktop
Comment thread
m1racoli marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,15 @@ async def run(self) -> AsyncIterator[TriggerEvent]:
}
)
except Exception as e:
self.log.exception(e)
if self.run_id:
try:
self.log.info("Cancelling pipeline run %s", self.run_id)
await hook.cancel_pipeline_run(
run_id=self.run_id,
resource_group_name=self.resource_group_name,
factory_name=self.factory_name,
)
self.log.info("Unexpected error %s caught. Cancel pipeline run %s", e, self.run_id)
except Exception as err:
yield TriggerEvent({"status": "error", "message": str(err), "run_id": self.run_id})
except Exception:
self.log.exception("Failed to cancel pipeline run %s", self.run_id)
yield TriggerEvent({"status": "error", "message": str(e), "run_id": self.run_id})
Loading