This is an automated email from the ASF dual-hosted git repository. ephraimanierobi pushed a commit to branch v2-3-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 249b11d28db12d70ef5aea08e407814a24f88683 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) (cherry picked from commit 93b7a57cbc64030deee6ef8d644dec111907495e) --- 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 9a97790ab7..82dd007172 100644 --- a/airflow/config_templates/config.yml +++ b/airflow/config_templates/config.yml @@ -410,7 +410,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 16f8d8a0d9..a6e7964bd5 100644 --- a/airflow/config_templates/default_airflow.cfg +++ b/airflow/config_templates/default_airflow.cfg @@ -230,7 +230,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
