0.7 + migrations

airflow/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.6.0"
+__version__ = "0.7.0"
 
 '''
 Authentication is implemented using flask_login and different environments can

airflow/models.py

@@ -632,7 +632,7 @@ def pool_full(self, session=None):
         task to run
         """
         if not self.task.pool:
-            return True
+            return False
 
         close_session = False
         if not session:
@@ -641,25 +641,25 @@ def pool_full(self, session=None):
 
         running = (
             session
-            .query(func.count('*'))
-            .select_from(TaskInstance)
+            .query(TaskInstance)
             .filter(TaskInstance.pool == self.task.pool)
             .filter(TaskInstance.state == State.RUNNING)
-            .scalar()
+            .count()
         )
-        pool_size = (
+        pool = (
             session
             .query(Pool)
             .filter(Pool.pool == self.task.pool)
             .first()
         )
-        if not pool_size:
+        if not pool:
             return False
 
         if close_session:
+            session.expunge_all()
             session.commit()
             session.close()
-        return running < pool_size
+        return running >= pool.slots
 
 
     def run(

migrations.sql

@@ -0,0 +1,5 @@
+// To 0.7
+alter table task_instance add column queue varchar(50) NULL;
+alter table task_instance add column pool varchar(50) NULL;
+alter table task_instance add column priority_weight INT NULL;
+create index ti_pool on task_instance (pool, state) using btree;

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Kept manually in sync with airflow.__version__
-version = '0.6.0'
+version = '0.7.0'
 
 doc = [
     'sphinx>=1.2.3',