Fix 2.7.0 db migration job errors (#33652)

* Fix circular import from kubernetes_executor * Do not validate SQL when initialising Sentry --------- Co-authored-by: Lipu Fei <[email protected]> (cherry picked from commit 4bdf908)
apache · Aug 28, 2023 · 4befd33 · 4befd33
1 parent b0f9afb
commit 4befd33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py b/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py
@@ -36,7 +36,7 @@
 
 from sqlalchemy.orm import Session
 
-from airflow import AirflowException
+from airflow.exceptions import AirflowException
 
 try:
     from airflow.cli.cli_config import (

diff --git a/airflow/sentry.py b/airflow/sentry.py
@@ -87,7 +87,7 @@ def __init__(self):
             # LoggingIntegration is set by default.
             integrations = [sentry_flask]
 
-            executor_class, _ = ExecutorLoader.import_default_executor_cls()
+            executor_class, _ = ExecutorLoader.import_default_executor_cls(validate=False)
 
             if executor_class.supports_sentry:
                 from sentry_sdk.integrations.celery import CeleryIntegration