Move [scheduler]dag_dir_list_interval to `[dag_bundles]refresh_inte…

…rval` (#45722)

This config should be the default refresh_interval in AF3, so move its
predecesor.

airflow/config_templates/config.yml

@@ -2286,13 +2286,6 @@ scheduler:
       type: integer
       example: ~
       default: "50"
-    dag_dir_list_interval:
-      description: |
-        How often (in seconds) to scan the DAGs directory for new files. Default to 5 minutes.
-      version_added: ~
-      type: integer
-      example: ~
-      default: "300"
     print_stats_interval:
       description: |
         How often should stats be printed to the logs. Setting to 0 will disable printing stats
@@ -2681,7 +2674,7 @@ dag_bundles:
       description: |
         List of backend configs.  Must supply name, classpath, and kwargs for each backend.
 
-        By default, ``refresh_interval`` is set to ``[scheduler] dag_dir_list_interval``, but that can
+        By default, ``refresh_interval`` is set to ``[dag_bundles] refresh_interval``, but that can
         also be overridden in kwargs if desired.
 
         The default is the dags folder dag bundle.
@@ -2711,3 +2704,10 @@ dag_bundles:
               "kwargs": {{}}
             }}
             ]
+    refresh_interval:
+      description: |
+        How often (in seconds) to refresh, or look for new files, in a DAG bundle.
+      version_added: ~
+      type: integer
+      example: ~
+      default: "300"

airflow/config_templates/unit_tests.cfg

@@ -88,7 +88,6 @@ result_backend = db+mysql://airflow:airflow@localhost:3306/airflow
 job_heartbeat_sec = 1
 scheduler_heartbeat_sec = 5
 parsing_processes = 2
-dag_dir_list_interval = 0
 
 [triggerer]
 # Those values are set so that during unit tests things run faster than usual.

airflow/configuration.py

@@ -324,7 +324,9 @@ def sensitive_config_values(self) -> set[tuple[str, str]]:
     # A mapping of (new section, new option) -> (old section, old option, since_version).
     # When reading new option, the old option will be checked to see if it exists. If it does a
     # DeprecationWarning will be issued and the old option will be used instead
-    deprecated_options: dict[tuple[str, str], tuple[str, str, str]] = {}
+    deprecated_options: dict[tuple[str, str], tuple[str, str, str]] = {
+        ("dag_bundles", "refresh_interval"): ("scheduler", "dag_dir_list_interval", "3.0"),
+    }
 
     # A mapping of new section -> (old section, since_version).
     deprecated_sections: dict[str, tuple[str, str]] = {}

airflow/dag_processing/bundles/base.py

@@ -46,7 +46,13 @@ class BaseDagBundle(ABC):
 
     supports_versioning: bool = False
 
-    def __init__(self, *, name: str, refresh_interval: int = 300, version: str | None = None) -> None:
+    def __init__(
+        self,
+        *,
+        name: str,
+        refresh_interval: int = conf.getint("dag_bundles", "refresh_interval"),
+        version: str | None = None,
+    ) -> None:
         self.name = name
         self.version = version
         self.refresh_interval = refresh_interval

docs/apache-airflow/administration-and-deployment/scheduler.rst

@@ -354,9 +354,6 @@ However, you can also look at other non-performance-related scheduler configurat
   queued tasks that were launched by the dead process will be "adopted" and
   monitored by this scheduler instead.
 
-- :ref:`config:scheduler__dag_dir_list_interval`
-  How often (in seconds) to scan the DAGs directory for new files.
-
 - :ref:`config:scheduler__file_parsing_sort_mode`
   The scheduler will list and sort the DAG files to decide the parsing order.
 

docs/apache-airflow/best-practices.rst

@@ -443,7 +443,7 @@ each parameter by following the links):
 
 * :ref:`config:scheduler__scheduler_idle_sleep_time`
 * :ref:`config:scheduler__min_file_process_interval`
-* :ref:`config:scheduler__dag_dir_list_interval`
+* :ref:`config:dag_bundles__refresh_interval`
 * :ref:`config:scheduler__parsing_processes`
 * :ref:`config:scheduler__file_parsing_sort_mode`