A few adjustments on CeleryExecutor

MaximeKestemont · Dec 30, 2014 · 34bb46f · 34bb46f
1 parent bf39f12
commit 34bb46f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/airflow/executors/__init__.py b/airflow/executors/__init__.py
@@ -7,7 +7,7 @@
 if _EXECUTOR == 'LocalExecutor':
     from airflow.executors.local_executor import LocalExecutor
     DEFAULT_EXECUTOR = LocalExecutor()
-elif _EXECUTOR == 'LocalExecutor':
+elif _EXECUTOR == 'CeleryExecutor':
     from airflow.executors.celery_executor import CeleryExecutor
     DEFAULT_EXECUTOR = CeleryExecutor()
 elif _EXECUTOR == 'SequentialExecutor':

diff --git a/airflow/executors/celery_executor.py b/airflow/executors/celery_executor.py
@@ -50,7 +50,7 @@ def heartbeat(self):
             if self.last_state[key] != async.state:
                 if async.state == celery_states.SUCCESS:
                     self.change_state(key, State.SUCCESS)
-                elif async.state in celery_states.FAILURE_STATES:
+                elif async.state == celery_states.FAILURE:
                     self.change_state(key, State.FAILED)
                 self.last_state[key] = async.state
 

diff --git a/init.sh b/init.sh
@@ -2,6 +2,7 @@
 source $AIRFLOW_HOME/env/bin/activate
 export PYTHONPATH=$AIRFLOW_HOME
 export AIRFLOW_CONFIG_PATH=$AIRFLOW_HOME/airflow/airflow.cfg
+export PATH=$PATH:$AIRFLOW_HOME/airflow/bin
 
 # Create the conf file from template if it doesn't exist
 if [ ! -f $AIRFLOW_CONFIG_PATH ]; then