[AIRFLOW-796] Add processor_poll_interval and num_runs to config (apache#5009)

gsakkis · kaxil · commit 50343040ff46 · 2019-09-13T20:18:34.000+01:00
cherry-picked from 8751133
diff --git a/airflow/bin/cli.py b/airflow/bin/cli.py
@@ -1852,7 +1852,7 @@ class CLIFactory(object):
             help="Set number of seconds to execute before exiting"),
         'num_runs': Arg(
             ("-n", "--num_runs"),
-            default=-1, type=int,
+            default=conf.getint('scheduler', 'num_runs', fallback=-1), type=int,
             help="Set the number of runs to execute before exiting"),
         # worker
         'do_pickle': Arg(
diff --git a/airflow/config_templates/default_airflow.cfg b/airflow/config_templates/default_airflow.cfg
@@ -497,6 +497,13 @@ scheduler_heartbeat_sec = 5
 # -1 indicates to run continuously (see also num_runs)
 run_duration = -1
 
+# The number of times to try to schedule each DAG file
+# -1 indicates unlimited number
+num_runs = -1
+
+# The number of seconds to wait between consecutive DAG file processing
+processor_poll_interval = 1
+
 # after how much time (seconds) a new DAGs should be picked up from the filesystem
 min_file_process_interval = 0
 
diff --git a/airflow/jobs/scheduler_job.py b/airflow/jobs/scheduler_job.py
@@ -328,8 +328,9 @@ def __init__(
             dag_id=None,
             dag_ids=None,
             subdir=settings.DAGS_FOLDER,
-            num_runs=-1,
-            processor_poll_interval=1.0,
+            num_runs=conf.getint('scheduler', 'num_runs', fallback=-1),
+            processor_poll_interval=conf.getfloat(
+                'scheduler', 'processor_poll_interval', fallback=1),
             run_duration=None,
             do_pickle=False,
             log=None,
