From 54bd09549cef4379000ab49a34bf17bf8fd8b3a2 Mon Sep 17 00:00:00 2001
From: aoen <aoen@users.noreply.github.com>
Date: Wed, 11 Dec 2019 17:15:40 +0200
Subject: [PATCH] [TWTR][CX-17516] Queue tasks already being handled by the
 executor (#26)

* [TWTR][CX-17516] Queue tasks even if already being handled by the executor

* [AIRFLOW-4332] Upgrade sqlalchemy to remove security Vulnerability
---
 airflow/jobs.py    | 3 +--
 airflow/version.py | 2 +-
 setup.py           | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/airflow/jobs.py b/airflow/jobs.py
index dca0d870e0c4e..bfdfc5e3d1868 100644
--- a/airflow/jobs.py
+++ b/airflow/jobs.py
@@ -1224,10 +1224,9 @@ def _find_executable_task_instances(self, simple_dag_bag, states, session=None):
 
                 if self.executor.has_task(task_instance):
                     self.log.debug(
-                        "Not handling task %s as the executor reports it is running",
+                        "Still handling task %s even though as the executor reports it is running",
                         task_instance.key
                     )
-                    continue
                 executable_tis.append(task_instance)
                 open_slots -= 1
                 dag_id_to_possibly_running_task_count[dag_id] += 1
diff --git a/airflow/version.py b/airflow/version.py
index 6acabbbf24a19..4cf0c63e5a6a3 100644
--- a/airflow/version.py
+++ b/airflow/version.py
@@ -18,4 +18,4 @@
 # under the License.
 #
 
-version = '1.10.0+twtr23'
+version = '1.10.0+twtr24'
diff --git a/setup.py b/setup.py
index 991e32fdd0c6c..d4a4076af2abd 100644
--- a/setup.py
+++ b/setup.py
@@ -297,7 +297,7 @@ def do_setup():
             'python-nvd3==0.15.0',
             'requests>=2.5.1, <3',
             'setproctitle>=1.1.8, <2',
-            'sqlalchemy>=1.1.15, <1.2.0',
+            'sqlalchemy>=1.1.15, <1.4.0',
             'tabulate>=0.7.5, <0.8.0',
             'tenacity==4.8.0',
             'thrift>=0.9.2',