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 2016/06/17 19:20:40 UTC

[1/2] incubator-airflow git commit: [AIRFLOW-256] Fix test_scheduler_reschedule heartrate

Repository: incubator-airflow
Updated Branches:
  refs/heads/master adcccfa26 -> d243c003b


[AIRFLOW-256] Fix test_scheduler_reschedule heartrate

test_scheduler_reschedule runs two schedulerjob quite
fast after one another this sometimes is faster than
the heartrate allows and thus the tasks will not get
rescheduled and the test will fail. Fixed by setting
heartrate to 0.


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/ab2d71be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/ab2d71be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/ab2d71be

Branch: refs/heads/master
Commit: ab2d71be199708918c1f6d85f0c48c51c777f1e4
Parents: ce362c3
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Fri Jun 17 20:52:38 2016 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Fri Jun 17 20:52:38 2016 +0200

----------------------------------------------------------------------
 tests/jobs.py | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/ab2d71be/tests/jobs.py
----------------------------------------------------------------------
diff --git a/tests/jobs.py b/tests/jobs.py
index 3618ce4..0619f3d 100644
--- a/tests/jobs.py
+++ b/tests/jobs.py
@@ -770,6 +770,7 @@ class SchedulerJobTest(unittest.TestCase):
         @mock.patch('airflow.models.DagBag.collect_dags')
         def do_schedule(function, function2):
             scheduler = SchedulerJob(num_runs=1, executor=executor,)
+            scheduler.heartrate = 0
             scheduler.run()
 
         do_schedule()


[2/2] incubator-airflow git commit: Merge remote-tracking branch 'apache/master'

Posted by bo...@apache.org.
Merge remote-tracking branch 'apache/master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/d243c003
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/d243c003
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/d243c003

Branch: refs/heads/master
Commit: d243c003b09b3f1ff395592890f32d5269b8f27b
Parents: ab2d71b adcccfa
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Fri Jun 17 21:20:23 2016 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Fri Jun 17 21:20:23 2016 +0200

----------------------------------------------------------------------
 airflow/__init__.py                             |   6 +-
 .../contrib/example_dags/example_twitter_dag.py |   4 +-
 airflow/contrib/hooks/__init__.py               |  33 +-
 airflow/contrib/operators/__init__.py           |  42 ++-
 airflow/contrib/operators/fs_operator.py        |   3 +-
 airflow/contrib/operators/mysql_to_gcs.py       |   2 +-
 airflow/contrib/operators/vertica_to_hive.py    |   2 +-
 .../contrib/plugins/metastore_browser/main.py   |   4 +-
 airflow/example_dags/example_http_operator.py   |   3 +-
 airflow/hooks/__init__.py                       |  73 +++-
 airflow/hooks/base_hook.py                      |  14 +
 airflow/hooks/dbapi_hook.py                     |  14 +
 airflow/hooks/druid_hook.py                     |  14 +
 airflow/hooks/hdfs_hook.py                      |  14 +
 airflow/hooks/http_hook.py                      |   2 +-
 airflow/hooks/jdbc_hook.py                      |  14 +
 airflow/hooks/mssql_hook.py                     |  14 +
 airflow/hooks/mysql_hook.py                     |  14 +
 airflow/hooks/oracle_hook.py                    |  14 +
 airflow/hooks/pig_hook.py                       |  14 +
 airflow/hooks/postgres_hook.py                  |  14 +
 airflow/hooks/presto_hook.py                    |  14 +
 airflow/hooks/samba_hook.py                     |  14 +
 airflow/hooks/sqlite_hook.py                    |  14 +
 airflow/hooks/webhdfs_hook.py                   |  14 +
 airflow/macros/__init__.py                      |  38 ++-
 airflow/macros/hive.py                          |   4 +-
 airflow/models.py                               |  38 ++-
 airflow/operators/__init__.py                   | 120 +++++--
 airflow/operators/bash_operator.py              |  14 +
 airflow/operators/check_operator.py             |  14 +
 airflow/operators/dagrun_operator.py            |  14 +
 airflow/operators/docker_operator.py            |  14 +
 airflow/operators/dummy_operator.py             |  14 +
 airflow/operators/email_operator.py             |  14 +
 airflow/operators/generic_transfer.py           |  14 +
 airflow/operators/hive_operator.py              |  16 +-
 airflow/operators/hive_stats_operator.py        |  18 +-
 airflow/operators/hive_to_druid.py              |  17 +-
 airflow/operators/hive_to_mysql.py              |  17 +-
 airflow/operators/hive_to_samba_operator.py     |  17 +-
 airflow/operators/http_operator.py              |  14 +
 airflow/operators/jdbc_operator.py              |  14 +
 airflow/operators/mssql_operator.py             |  16 +-
 airflow/operators/mssql_to_hive.py              |  17 +-
 airflow/operators/mysql_operator.py             |  16 +-
 airflow/operators/mysql_to_hive.py              |  17 +-
 airflow/operators/oracle_operator.py            |   2 +-
 airflow/operators/pig_operator.py               |  16 +-
 airflow/operators/postgres_operator.py          |  16 +-
 airflow/operators/presto_check_operator.py      |  16 +-
 airflow/operators/presto_to_mysql.py            |  17 +-
 airflow/operators/python_operator.py            |  14 +
 airflow/operators/s3_file_transform_operator.py |  16 +-
 airflow/operators/s3_to_hive_operator.py        |  17 +-
 airflow/operators/sensors.py                    |  31 +-
 airflow/operators/slack_operator.py             |  14 +
 airflow/operators/sqlite_operator.py            |  14 +
 airflow/plugins_manager.py                      |  30 +-
 airflow/utils/email.py                          |  18 +-
 airflow/utils/logging.py                        |   2 +-
 airflow/utils/tests.py                          |  23 ++
 dags/testdruid.py                               |   2 +-
 run_unit_tests.sh                               |   3 +
 setup.py                                        |  14 +
 tests/__init__.py                               |   2 +-
 tests/core.py                                   | 340 +------------------
 tests/operators/__init__.py                     |  17 +
 tests/operators/hive_operator.py                | 209 ++++++++++++
 tests/operators/operators.py                    | 174 ++++++++++
 tests/operators/sensor.py                       |  39 ---
 tests/operators/sensors.py                      |  39 +++
 72 files changed, 1458 insertions(+), 474 deletions(-)
----------------------------------------------------------------------