Merge branch 'v2-11-test' into leo-santos/addtional-scheduler-fix

leossantos · web-flow · commit a3787f904462 · 2026-03-30T10:23:02.000-03:00
diff --git a/.github/workflows/ci-image-checks.yml b/.github/workflows/ci-image-checks.yml
@@ -325,7 +325,7 @@ jobs:
       - name: "Cleanup docker"
         run: ./scripts/ci/cleanup_docker.sh
       - name: "Download docs prepared as artifacts"
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3  # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           name: airflow-docs
           path: './docs/_build'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -628,7 +628,7 @@ jobs:
     steps:
       - name: Notify Slack
         id: slack
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a  # v2.1.1
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95  # v3.0.1
         with:
           method: chat.postMessage
           token: ${{ env.SLACK_BOT_TOKEN }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -52,12 +52,12 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2588666de8825e1e9dc4e2329a4c985457d55b32  # v3.32.1
+        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98  # v4.32.6
         with:
           languages: ${{ matrix.language }}
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@2588666de8825e1e9dc4e2329a4c985457d55b32  # v3.32.1
+        uses: github/codeql-action/autobuild@0d579ffd059c29b07949a3cce3983f0780820c98  # v4.32.6
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2588666de8825e1e9dc4e2329a4c985457d55b32  # v3.32.1
+        uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98  # v4.32.6
diff --git a/.github/workflows/finalize-tests.yml b/.github/workflows/finalize-tests.yml
@@ -116,7 +116,7 @@ jobs:
           persist-credentials: true
           fetch-depth: 0
       - name: "Download constraints from the constraints generated by build CI image"
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3  # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           pattern: constraints-*
           path: ./files
@@ -195,7 +195,7 @@ jobs:
         shell: bash
         run: ./scripts/tools/free_up_disk_space.sh
       - name: "Download all test warning artifacts from the current build"
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3  # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           path: ./artifacts
           pattern: test-warnings-*
diff --git a/.github/workflows/prod-image-build.yml b/.github/workflows/prod-image-build.yml
@@ -225,12 +225,12 @@ jobs:
         shell: bash
         run: rm -fv ./dist/* ./docker-context-files/*
       - name: "Download packages prepared as artifacts"
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3  # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           name: prod-packages
           path: ./docker-context-files
       - name: "Download constraints"
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3  # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           name: constraints-${{ matrix.python-version }}
           path: ./docker-context-files/constraints-${{ matrix.python-version }}
diff --git a/.github/workflows/push-image-cache.yml b/.github/workflows/push-image-cache.yml
@@ -208,7 +208,7 @@ jobs:
       - name: "Cleanup dist and context file"
         run: rm -fv ./dist/* ./docker-context-files/*
       - name: "Download packages prepared as artifacts"
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3  # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           name: prod-packages
           path: ./docker-context-files
diff --git a/.github/workflows/release_single_dockerhub_image.yml b/.github/workflows/release_single_dockerhub_image.yml
@@ -192,7 +192,7 @@ jobs:
           ACTOR: ${{ github.actor }}
         run: echo "${GITHUB_TOKEN}" | docker login ghcr.io -u ${ACTOR} --password-stdin
       - name: "Download metadata artifacts"
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3  # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           path: ./dist
           pattern: metadata-${{ inputs.pythonVersion }}-*
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
@@ -21,7 +21,7 @@
 
 .. towncrier release notes start
 
-Airflow 2.11.2 (2026-03-11)
+Airflow 2.11.2 (2026-03-14)
 ---------------------------
 
 Significant Changes
diff --git a/airflow/dag_processing/processor.py b/airflow/dag_processing/processor.py
@@ -846,6 +846,15 @@ def _execute_task_callbacks(
         if not ti:
             return
 
+        if request.is_failure_callback and simple_ti.try_number != ti.try_number:
+            cls.logger().warning(
+                "Skipping stale failure callback for %s: callback try_number=%s, current try_number=%s",
+                ti,
+                simple_ti.try_number,
+                ti.try_number,
+            )
+            return
+
         task: Operator | None = None
 
         if dagbag and simple_ti.dag_id in dagbag.dags:
diff --git a/airflow/reproducible_build.yaml b/airflow/reproducible_build.yaml
@@ -1,2 +1,2 @@
-release-notes-hash: 2a113e5130206b6093f308203895c73b
-source-date-epoch: 1773077085
+release-notes-hash: bdf848d3041549e8ba1a5ab639d6b2d4
+source-date-epoch: 1773515622
diff --git a/airflow/www/changes_in_2_11_dependencies.rst b/airflow/www/changes_in_2_11_dependencies.rst
@@ -61,7 +61,7 @@ HIGH RISK — Major version bumps with known breaking changes
 | swagger-ui-dist              | 4.1.3      | 5.32.0     | CSS class names changed, rendering differences, bundled CSS    |
 |                              |            |            | restructured.                                                  |
 +------------------------------+------------+------------+----------------------------------------------------------------+
-| react-markdown               | ^8.0.4     | ^10.1.0    | Major v9 and v10. Moved to ESM-only, plugin API changes,      |
+| react-markdown               | ^8.0.4     | ^10.1.0    | Major v9 and v10. Moved to ESM-only, plugin API changes,       |
 |                              |            |            | remark/rehype ecosystem alignment, component prop changes.     |
 +------------------------------+------------+------------+----------------------------------------------------------------+
 | d3-shape                     | ^2.1.0     | ^3.2.0     | d3.line().curve() defaults changed, some curve types renamed.  |
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ requires = [
     "hatchling==1.29.0",
     "packaging==26.0",
     "pathspec==1.0.4",
-    "platformdirs==4.9.2",
+    "platformdirs==4.9.4",
     "pluggy==1.6.0",
     "tomli==2.4.0; python_version < '3.11'",
     "trove-classifiers==2026.1.14.14",
diff --git a/tests/dag_processing/test_processor.py b/tests/dag_processing/test_processor.py
@@ -533,6 +533,50 @@ def test_execute_on_failure_callbacks(self, mock_ti_handle_failure):
             error="Message", test_mode=conf.getboolean("core", "unit_test_mode"), session=session
         )
 
+    @pytest.mark.skip_if_database_isolation_mode  # Test is broken in db isolation mode
+    @patch.object(DagFileProcessor, "logger")
+    @patch.object(TaskInstance, "handle_failure")
+    def test_execute_on_failure_callbacks_skips_stale_try_number(self, mock_ti_handle_failure, mock_logger):
+        dagbag = DagBag(dag_folder="/dev/null", include_examples=True, read_dags_from_db=False)
+        dag_file_processor = DagFileProcessor(
+            dag_ids=[], dag_directory=TEST_DAGS_FOLDER, log=mock.MagicMock()
+        )
+        with create_session() as session:
+            session.query(TaskInstance).delete()
+            dag = dagbag.get_dag("example_branch_operator")
+            dagrun = dag.create_dagrun(
+                state=State.RUNNING,
+                execution_date=DEFAULT_DATE,
+                run_type=DagRunType.SCHEDULED,
+                data_interval=dag.infer_automated_data_interval(DEFAULT_DATE),
+                session=session,
+            )
+            task = dag.get_task(task_id="run_this_first")
+            ti = TaskInstance(task, run_id=dagrun.run_id, state=State.RUNNING)
+            session.add(ti)
+            session.flush()
+
+            simple_ti = SimpleTaskInstance.from_ti(ti)
+            ti.try_number += 1
+            session.flush()
+
+            requests = [
+                TaskCallbackRequest(
+                    full_filepath="A",
+                    simple_task_instance=simple_ti,
+                    msg="Message",
+                )
+            ]
+            dag_file_processor.execute_callbacks(dagbag, requests, dag_file_processor.UNIT_TEST_MODE, session)
+
+        mock_ti_handle_failure.assert_not_called()
+        mock_logger.return_value.warning.assert_called_once_with(
+            "Skipping stale failure callback for %s: callback try_number=%s, current try_number=%s",
+            ti,
+            simple_ti.try_number,
+            ti.try_number,
+        )
+
     @pytest.mark.skip_if_database_isolation_mode  # Test is broken in db isolation mode
     @pytest.mark.parametrize(
         ["has_serialized_dag"],
