You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2017/10/24 18:46:10 UTC
incubator-airflow git commit: [AIRFLOW-1744] Make sure max_tries can
be set
Repository: incubator-airflow
Updated Branches:
refs/heads/master 1475e6707 -> f271d437a
[AIRFLOW-1744] Make sure max_tries can be set
task.retries can be False. Which is not acceptable
for
and integer field.
Closes #2713 from bolkedebruin/AIRFLOW-1744
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/f271d437
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/f271d437
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/f271d437
Branch: refs/heads/master
Commit: f271d437a6d168521d6d6b06e43ce9262ba3dccf
Parents: 1475e67
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Tue Oct 24 20:45:44 2017 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Tue Oct 24 20:45:44 2017 +0200
----------------------------------------------------------------------
.../cc1e65623dc7_add_max_tries_column_to_task_instance.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f271d437/airflow/migrations/versions/cc1e65623dc7_add_max_tries_column_to_task_instance.py
----------------------------------------------------------------------
diff --git a/airflow/migrations/versions/cc1e65623dc7_add_max_tries_column_to_task_instance.py b/airflow/migrations/versions/cc1e65623dc7_add_max_tries_column_to_task_instance.py
index b151e0c..4cb43b1 100644
--- a/airflow/migrations/versions/cc1e65623dc7_add_max_tries_column_to_task_instance.py
+++ b/airflow/migrations/versions/cc1e65623dc7_add_max_tries_column_to_task_instance.py
@@ -33,6 +33,7 @@ from sqlalchemy.engine.reflection import Inspector
BATCH_SIZE = 5000
+
def upgrade():
op.add_column('task_instance', sa.Column('max_tries', sa.Integer,
server_default="-1"))
@@ -69,8 +70,12 @@ def upgrade():
ti.max_tries = ti.try_number
else:
task = dag.get_task(ti.task_id)
- ti.max_tries = task.retries
+ if task.retries:
+ ti.max_tries = task.retries
+ else:
+ ti.max_tries = ti.try_number
session.merge(ti)
+
session.commit()
# Commit the current session.
session.commit()