Skip to content

Commit

Permalink
[TWTR][CX-17516] Queue tasks already being handled by the executor (t…
Browse files Browse the repository at this point in the history
…witter-forks#26)

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

* [AIRFLOW-4332] Upgrade sqlalchemy to remove security Vulnerability
  • Loading branch information
aoen authored Dec 11, 2019
1 parent 67a4d1c commit 54bd095
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions airflow/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion airflow/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
# under the License.
#

version = '1.10.0+twtr23'
version = '1.10.0+twtr24'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 54bd095

Please sign in to comment.