[
https://issues.apache.org/jira/browse/AIRFLOW-3111?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16627594#comment-16627594
]
ASF GitHub Bot commented on AIRFLOW-3111:
-----------------------------------------
feng-tao closed pull request #3944: [AIRFLOW-3111] Fix instructions in
UPDATING.md and remove comment artifacts
URL: https://github.com/apache/incubator-airflow/pull/3944
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/UPDATING.md b/UPDATING.md
index 4fd45b2c0e..93ea069838 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -134,11 +134,11 @@ With Airflow 1.9 or lower, `FILENAME_TEMPLATE`,
`PROCESSOR_FILENAME_TEMPLATE`, `
```
[core]
fab_logging_level = WARN
-log_filename_template = {{{{ ti.dag_id }}}}/{{{{ ti.task_id }}}}/{{{{ ts
}}}}/{{{{ try_number }}}}.log
-log_processor_filename_template = {{{{ filename }}}}.log
+log_filename_template = {{ ti.dag_id }}/{{ ti.task_id }}/{{ ts }}/{{
try_number }}.log
+log_processor_filename_template = {{ filename }}.log
[elasticsearch]
-elasticsearch_log_id_template =
{{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}
+elasticsearch_log_id_template =
{dag_id}-{task_id}-{execution_date}-{try_number}
elasticsearch_end_of_log_mark = end_of_log
```
diff --git a/airflow/config_templates/default_airflow.cfg
b/airflow/config_templates/default_airflow.cfg
index 8d068c5428..0028d7832f 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -62,12 +62,10 @@ fab_logging_level = WARN
logging_config_class =
# Log format
-# we need to escape the curly braces by adding an additional curly brace
log_format = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(levelname)s -
%%(message)s
simple_log_format = %%(asctime)s %%(levelname)s - %%(message)s
# Log filename format
-# we need to escape the curly braces by adding an additional curly brace
log_filename_template = {{{{ ti.dag_id }}}}/{{{{ ti.task_id }}}}/{{{{ ts
}}}}/{{{{ try_number }}}}.log
log_processor_filename_template = {{{{ filename }}}}.log
@@ -561,7 +559,6 @@ hide_sensitive_variable_fields = True
[elasticsearch]
elasticsearch_host =
-# we need to escape the curly braces by adding an additional curly brace
elasticsearch_log_id_template =
{{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}
elasticsearch_end_of_log_mark = end_of_log
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Confusing comments and instructions for log templates in UPDATING.md and
> default_airflow.cfg
> --------------------------------------------------------------------------------------------
>
> Key: AIRFLOW-3111
> URL: https://issues.apache.org/jira/browse/AIRFLOW-3111
> Project: Apache Airflow
> Issue Type: Bug
> Reporter: Eric Chang
> Assignee: Eric Chang
> Priority: Minor
>
> The new 1.10 release includes instructions on updating the *airflow.cfg*
> options core.log_filename_template and
> elasticsearch.elasticsearch_log_id_template that are technically incorrect:
>
> {code:java}
> // UPDATING.md
> ...the following defaults need to be added.
> [core]
> log_filename_template = {{{{ ti.dag_id }}}}/{{{{ ti.task_id }}}}/{{{{ ts
> }}}}/{{{{ try_number }}}}.log
> [elasticsearch]
> elasticsearch_log_id_template =
> {{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}{code}
>
> Inserting the above options into an existing *airflow.cfg* will result in a
> jinja parse failure because `{{{{` is not a valid template string. The reason
> the extra braces are necessary is because the default *airflow.cfg* copied to
> AIRFLOW_HOME is a rendered version of *default_airflow.cfg* (rendered by
> *airflow.configuration.parameterized_config*).
> The confusion is compounded by several comments copied over to *airflow.cfg*
> stating that
>
> {code:java}
> # we need to escape the curly braces by adding an additional curly brace
> {code}
> But that's is only true for *default_airflow.cfg* and doesn't apply to the
> actual *airflow.cfg*.
> I'll submit a PR that corrects this.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
