Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ def __init__(self, *args, **kwargs):
from airflow.configuration import conf as global_conf

self.conf = global_conf
# Also set team_name to None if it doesn't exist, since the Celery app creation expects it to be
# there (even if it's None)
if not hasattr(self, "team_name"):
self.team_name = None

# Create Celery app, it will be team specific if the configuration has been set for that.
from airflow.providers.celery.executors.celery_executor_utils import create_celery_app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

from airflow.configuration import AirflowConfigParser, conf
from airflow.executors.base_executor import BaseExecutor
from airflow.providers.celery.version_compat import AIRFLOW_V_3_0_PLUS
from airflow.providers.celery.version_compat import AIRFLOW_V_3_0_PLUS, AIRFLOW_V_3_2_PLUS
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, Stats, timeout
from airflow.utils.log.logging_mixin import LoggingMixin
from airflow.utils.net import get_hostname
Expand Down Expand Up @@ -319,7 +319,7 @@ def send_task_to_executor(
if TYPE_CHECKING:
_conf: ExecutorConf | AirflowConfigParser
# Check if Airflow version is greater than or equal to 3.2 to import ExecutorConf
if AIRFLOW_V_3_0_PLUS:
if AIRFLOW_V_3_2_PLUS:
from airflow.executors.base_executor import ExecutorConf

_conf = ExecutorConf(team_name)
Expand Down