Skip to content

Commit

Permalink
Merge pull request apache#477 from mtustin-handy/mtustin-handy-donot-…
Browse files Browse the repository at this point in the history
…pickle

Make donot_pickle a configuration option
  • Loading branch information
mistercrunch committed Oct 1, 2015
2 parents c40f6e6 + def286e commit 39293f3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions airflow/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class AirflowConfigException(Exception):
'parallelism': 32,
'load_examples': True,
'plugins_folder': None,
'donot_pickle': False,
},
'webserver': {
'base_url': 'http://localhost:8080',
Expand Down Expand Up @@ -113,6 +114,9 @@ class AirflowConfigException(Exception):
# Secret key to save connection passwords in the db
fernet_key = {FERNET_KEY}
# Whether to disable pickling dags
donot_pickle = False
[webserver]
# The base url of your website as airflow cannot guess what domain or
# cname you are using. This is use in automated emails that
Expand Down Expand Up @@ -243,6 +247,7 @@ class AirflowConfigException(Exception):
sql_alchemy_conn = sqlite:///{AIRFLOW_HOME}/unittests.db
unit_test_mode = True
load_examples = True
donot_pickle = False
[webserver]
base_url = http://localhost:8080
Expand Down
2 changes: 1 addition & 1 deletion airflow/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2226,7 +2226,7 @@ def db_merge(self):
def run(
self, start_date=None, end_date=None, mark_success=False,
include_adhoc=False, local=False, executor=None,
donot_pickle=False, ignore_dependencies=False):
donot_pickle=conf.getboolean('core', 'donot_pickle'), ignore_dependencies=False):
from airflow.jobs import BackfillJob
if not executor and local:
executor = LocalExecutor()
Expand Down

0 comments on commit 39293f3

Please sign in to comment.