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 93b7a57cbc Include missing mention of `external_executor_id` in
`sql_engine_collation_for_ids` docs (#25197)
93b7a57cbc is described below
commit 93b7a57cbc64030deee6ef8d644dec111907495e
Author: Michael Osthege <[email protected]>
AuthorDate: Thu Jul 21 22:29:23 2022 +0200
Include missing mention of `external_executor_id` in
`sql_engine_collation_for_ids` docs (#25197)
---
airflow/config_templates/config.yml | 3 ++-
airflow/config_templates/default_airflow.cfg | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/airflow/config_templates/config.yml
b/airflow/config_templates/config.yml
index 1555257179..b2c1b4e846 100644
--- a/airflow/config_templates/config.yml
+++ b/airflow/config_templates/config.yml
@@ -405,7 +405,8 @@
default: "utf-8"
- name: sql_engine_collation_for_ids
description: |
- Collation for ``dag_id``, ``task_id``, ``key`` columns in case they
have different encoding.
+ Collation for ``dag_id``, ``task_id``, ``key``,
``external_executor_id`` columns
+ in case they have different encoding.
By default this collation is the same as the database collation,
however for ``mysql`` and ``mariadb``
the default is ``utf8mb3_bin`` so that the index sizes of our index
keys will not exceed
the maximum size of allowed index when collation is set to ``utf8mb4``
variant
diff --git a/airflow/config_templates/default_airflow.cfg
b/airflow/config_templates/default_airflow.cfg
index d499d7ac06..b90f242d41 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -226,7 +226,8 @@ sql_alchemy_conn = sqlite:///{AIRFLOW_HOME}/airflow.db
# The encoding for the databases
sql_engine_encoding = utf-8
-# Collation for ``dag_id``, ``task_id``, ``key`` columns in case they have
different encoding.
+# Collation for ``dag_id``, ``task_id``, ``key``, ``external_executor_id``
columns
+# in case they have different encoding.
# By default this collation is the same as the database collation, however for
``mysql`` and ``mariadb``
# the default is ``utf8mb3_bin`` so that the index sizes of our index keys
will not exceed
# the maximum size of allowed index when collation is set to ``utf8mb4``
variant
