Skip to content

Add external_downstream_tasks markers for adm_export and adm_dma_export#9226

Open
akkomar wants to merge 2 commits into
mainfrom
add-adm-export-markers
Open

Add external_downstream_tasks markers for adm_export and adm_dma_export#9226
akkomar wants to merge 2 commits into
mainfrom
add-adm-export-markers

Conversation

@akkomar
Copy link
Copy Markdown
Member

@akkomar akkomar commented Apr 20, 2026

Add external_downstream_tasks markers to two bqetl_search_terms_daily queries so Airflow's recursive clear propagates from copy_deduplicate through to the hand-written adm_export and adm_dma_export DAGs in telemetry-airflow.

Both downstream DAGs already have ExternalTaskSensors on these upstream tasks, but the marker side was missing - after upstream backfills, the two export DAGs stayed stale until cleared manually.

@akkomar akkomar requested review from jasonthomas and whd as code owners April 20, 2026 14:28
@github-actions

This comment has been minimized.

@akkomar akkomar enabled auto-merge April 20, 2026 15:43
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 5, 2026

Integration report for "Add external_downstream_tasks markers for adm_export and adm_dma_export"

sql.diff

Click to expand!
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/dags/bqetl_search_terms_daily.py /tmp/workspace/generated-sql/dags/bqetl_search_terms_daily.py
--- /tmp/workspace/main-generated-sql/dags/bqetl_search_terms_daily.py	2026-05-05 20:47:45.233556606 +0000
+++ /tmp/workspace/generated-sql/dags/bqetl_search_terms_daily.py	2026-05-05 20:47:40.551524431 +0000
@@ -140,6 +140,20 @@
         arguments=["--schema_update_option=ALLOW_FIELD_ADDITION"],
     )
 
+    with TaskGroup(
+        "search_terms_derived__adm_daily_aggregates__v1_external",
+    ) as search_terms_derived__adm_daily_aggregates__v1_external:
+        ExternalTaskMarker(
+            task_id="adm_export__wait_for_adm_daily_aggregates",
+            external_dag_id="adm_export",
+            external_task_id="wait_for_adm_daily_aggregates",
+            execution_date="{{ (execution_date + macros.timedelta(0)).isoformat() }}",
+        )
+
+        search_terms_derived__adm_daily_aggregates__v1_external.set_upstream(
+            search_terms_derived__adm_daily_aggregates__v1
+        )
+
     search_terms_derived__adm_daily_aggregates_qa__v1 = bigquery_etl_query(
         task_id="search_terms_derived__adm_daily_aggregates_qa__v1",
         destination_table="adm_daily_aggregates_qa_v1",
@@ -177,6 +191,20 @@
         arguments=["--schema_update_option=ALLOW_FIELD_ADDITION"],
     )
 
+    with TaskGroup(
+        "search_terms_derived__adm_daily_dma_aggregates__v1_external",
+    ) as search_terms_derived__adm_daily_dma_aggregates__v1_external:
+        ExternalTaskMarker(
+            task_id="adm_dma_export__wait_for_adm_daily_dma_aggregates",
+            external_dag_id="adm_dma_export",
+            external_task_id="wait_for_adm_daily_dma_aggregates",
+            execution_date="{{ (execution_date + macros.timedelta(0)).isoformat() }}",
+        )
+
+        search_terms_derived__adm_daily_dma_aggregates__v1_external.set_upstream(
+            search_terms_derived__adm_daily_dma_aggregates__v1
+        )
+
     search_terms_derived__search_terms_daily__v1 = bigquery_etl_query(
         task_id="search_terms_derived__search_terms_daily__v1",
         destination_table="search_terms_daily_v1",
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/adm_daily_aggregates_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/adm_daily_aggregates_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/adm_daily_aggregates_v1/metadata.yaml	2026-05-05 20:47:48.092568469 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/adm_daily_aggregates_v1/metadata.yaml	2026-05-05 20:47:43.389535444 +0000
@@ -14,6 +14,10 @@
   dag_name: bqetl_search_terms_daily
   arguments:
   - --schema_update_option=ALLOW_FIELD_ADDITION
+  external_downstream_tasks:
+  - task_id: wait_for_adm_daily_aggregates
+    dag_name: adm_export
+    execution_delta: 0h
 bigquery:
   time_partitioning:
     type: day
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/adm_daily_dma_aggregates_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/adm_daily_dma_aggregates_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/adm_daily_dma_aggregates_v1/metadata.yaml	2026-05-05 20:47:48.092568469 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/adm_daily_dma_aggregates_v1/metadata.yaml	2026-05-05 20:47:43.389535444 +0000
@@ -14,6 +14,10 @@
   dag_name: bqetl_search_terms_daily
   arguments:
   - --schema_update_option=ALLOW_FIELD_ADDITION
+  external_downstream_tasks:
+  - task_id: wait_for_adm_daily_dma_aggregates
+    dag_name: adm_dma_export
+    execution_delta: 0h
 bigquery:
   time_partitioning:
     type: day

Link to full diff

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants