[airflow] branch main updated: Seed log_template table (#24511)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new c36d94df09 Seed log_template table (#24511)
c36d94df09 is described below

commit c36d94df09930abfb58856e1b8b6e059c7a44525
Author: Jed Cunningham <66...@users.noreply.github.com>
AuthorDate: Thu Jun 16 23:41:32 2022 -0600

    Seed log_template table (#24511)
    
    Seed the log_template table with the default values pre 2.3.0 so log
    retrieval still works post upgrade. This only worked previously if you
    have the default in your config, now it works even if you don't.
---
 airflow/utils/db.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/airflow/utils/db.py b/airflow/utils/db.py
index bfebbbd68b..d7c5b77c9c 100644
--- a/airflow/utils/db.py
+++ b/airflow/utils/db.py
@@ -808,6 +808,21 @@ def synchronize_log_template(*, session: Session = NEW_SESSION) -> None:
     filename = conf.get("logging", "log_filename_template")
     elasticsearch_id = conf.get("elasticsearch", "log_id_template")
 
+    # First check if we have an empty table. If so, and the default values exist,
+    # we will seed the table with the values from pre 2.3.0, so old logs will
+    # still be retrievable.
+    if not session.query(LogTemplate.id).first():
+        is_default_log_id = elasticsearch_id == conf.airflow_defaults.get("elasticsearch", "log_id_template")
+        is_default_filename = filename == conf.airflow_defaults.get("logging", "log_filename_template")
+        if is_default_log_id and is_default_filename:
+            session.add(
+                LogTemplate(
+                    filename="{{ ti.dag_id }}/{{ ti.task_id }}/{{ ts }}/{{ try_number }}.log",
+                    elasticsearch_id="{dag_id}-{task_id}-{execution_date}-{try_number}",
+                )
+            )
+            session.flush()
+
     # Before checking if the _current_ value exists, we need to check if the old config value we upgraded in
     # place exists!
     pre_upgrade_filename = conf.upgraded_values.get(("logging", "log_filename_template"), filename)