You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2018/09/29 00:45:16 UTC
[GitHub] 7yl4r closed pull request #3754: [Airflow-1737] Handle
`execution_date`s with fractional seconds in www/views
7yl4r closed pull request #3754: [Airflow-1737] Handle `execution_date`s with fractional seconds in www/views
URL: https://github.com/apache/incubator-airflow/pull/3754
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/airflow/utils/dates.py b/airflow/utils/dates.py
index 43b87f4b00..0a4b536bed 100644
--- a/airflow/utils/dates.py
+++ b/airflow/utils/dates.py
@@ -225,3 +225,18 @@ def days_ago(n, hour=0, minute=0, second=0, microsecond=0):
second=second,
microsecond=microsecond)
return today - timedelta(days=n)
+
+
+def execution_date_ptime(date_string):
+ """
+ Get datetime.datetime object from given date_string assuming format
+ string is ISO8601-like (aka looks like an execution_date).
+ Like datetime.strptime but for execution_dates.
+ Handles execution dates with *and* without fractional seconds.
+ """
+ ISO8601_FMT = '%Y-%m-%d %H:%M:%S'
+ ISO8601_FMT_FRACTIONAL = ISO8601_FMT + '.%f'
+ if len(date_string) > 19: # eg: 'YYYY-MM-DD HH:MM:SS.fffffff'
+ return datetime.strptime(date_string, ISO8601_FMT_FRACTIONAL)
+ else: # eg 'YYYY-MM-DD HH:MM:SS'
+ return datetime.strptime(ISO8601_FMT)
diff --git a/airflow/www/views.py b/airflow/www/views.py
index 63af88fd4b..83a653ca11 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -75,7 +75,11 @@
from airflow.utils.state import State
from airflow.utils.db import provide_session
from airflow.utils.helpers import alchemy_to_dict
-from airflow.utils.dates import infer_time_unit, scale_time_units
+from airflow.utils.dates import (
+ infer_time_unit,
+ scale_time_units,
+ execution_date_ptime
+)
from airflow.www import utils as wwwutils
from airflow.www.forms import DateTimeForm, DateTimeWithNumRunsForm
from airflow.www.validators import GreaterEqualThan
@@ -2527,10 +2531,12 @@ def set_task_instance_state(self, ids, target_state, session=None):
count = len(ids)
for id in ids:
task_id, dag_id, execution_date = id.split(',')
- execution_date = datetime.strptime(execution_date, '%Y-%m-%d %H:%M:%S')
- ti = session.query(TI).filter(TI.task_id == task_id,
- TI.dag_id == dag_id,
- TI.execution_date == execution_date).one()
+ execution_date = execution_date_ptime(execution_date)
+ ti = session.query(TI).filter(
+ TI.task_id == task_id,
+ TI.dag_id == dag_id,
+ TI.execution_date == execution_date
+ ).one()
ti.state = target_state
session.commit()
flash(
@@ -2547,10 +2553,12 @@ def delete_task_instances(self, ids, session=None):
count = 0
for id in ids:
task_id, dag_id, execution_date = id.split(',')
- execution_date = datetime.strptime(execution_date, '%Y-%m-%d %H:%M:%S')
- count += session.query(TI).filter(TI.task_id == task_id,
- TI.dag_id == dag_id,
- TI.execution_date == execution_date).delete()
+ execution_date = execution_date_ptime(execution_date)
+ count += session.query(TI).filter(
+ TI.task_id == task_id,
+ TI.dag_id == dag_id,
+ TI.execution_date == execution_date
+ ).delete()
session.commit()
flash("{count} task instances were deleted".format(**locals()))
except Exception as ex:
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services