You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "ramitkataria (via GitHub)" <gi...@apache.org> on 2025/07/22 19:12:39 UTC

[PR] Ramitkataria/deadlines/callback state [airflow]

ramitkataria opened a new pull request, #53650:
URL: https://github.com/apache/airflow/pull/53650

   <!--
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
    distributed with this work for additional information
    regarding copyright ownership.  The ASF licenses this file
    to you under the Apache License, Version 2.0 (the
    "License"); you may not use this file except in compliance
    with the License.  You may obtain a copy of the License at
   
      http://www.apache.org/licenses/LICENSE-2.0
   
    Unless required by applicable law or agreed to in writing,
    software distributed under the License is distributed on an
    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    KIND, either express or implied.  See the License for the
    specific language governing permissions and limitations
    under the License.
    -->
   
   <!--
   Thank you for contributing! Please make sure that your code changes
   are covered with tests. And in case of new features or big changes
   remember to adjust the documentation.
   
   Feel free to ping committers for the review!
   
   In case of an existing issue, reference it using one of the following:
   
   closes: #ISSUE
   related: #ISSUE
   
   How to write a good git commit message:
   http://chris.beams.io/posts/git-commit/
   -->
   
   
   
   <!-- Please keep an empty line above the dashes. -->
   Storing state of the deadline callback is needed to keep track of
   the deadlines that haven't been "marked as miss" by the scheduler yet.
   A non-empty `callback_state` means that the scheduler doesn't need to
   look at it in the next loop and it could just filter for deadlines that
   don't have a `callback_state` in the query for evaluating deadlines
   in the scheduler loop.
   
   Keeping track of the state is also helpful for monitoring, metrics and
   debugging for users.
   
   ---
   **^ Add meaningful description above**
   Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
   In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
   In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
   In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] AIP-86 - Add `callback_state` to deadline table [airflow]

Posted by "ramitkataria (via GitHub)" <gi...@apache.org>.
ramitkataria commented on code in PR #53650:
URL: https://github.com/apache/airflow/pull/53650#discussion_r2224029272


##########
airflow-core/tests/unit/models/test_deadline.py:
##########
@@ -210,13 +211,46 @@ def test_handle_miss_async_callback(self, dagrun, session):
 
     @pytest.mark.db_test
     @pytest.mark.parametrize(
-        "event, none_trigger_id_expected",
+        "event, none_trigger_expected, expected_state",
         [
-            pytest.param(TriggerEvent({"status": "success"}), True, id="success_event"),
-            pytest.param(TriggerEvent({"status": "some status"}), False, id="unknown_event"),
+            pytest.param(
+                TriggerEvent({EVENT_STATE_KEY: DeadlineCallbackState.SUCCESS, "result": "test_result"}),
+                True,
+                DeadlineCallbackState.SUCCESS,
+                id="success_event",
+            ),
+            pytest.param(
+                TriggerEvent({EVENT_STATE_KEY: DeadlineCallbackState.STARTED}),
+                False,
+                DeadlineCallbackState.STARTED,
+                id="started_event",
+            ),
+            pytest.param(
+                TriggerEvent(
+                    {EVENT_STATE_KEY: DeadlineCallbackState.NOT_FOUND, "message": "module not found"}
+                ),
+                True,
+                DeadlineCallbackState.NOT_FOUND,
+                id="not_found_event",
+            ),
+            pytest.param(
+                TriggerEvent({EVENT_STATE_KEY: DeadlineCallbackState.NOT_AWAITABLE}),
+                True,
+                DeadlineCallbackState.NOT_AWAITABLE,
+                id="not_awaitable_event",
+            ),
+            pytest.param(
+                TriggerEvent(
+                    {EVENT_STATE_KEY: DeadlineCallbackState.OTHER_FAILURE, "message": "error message"}
+                ),
+                True,
+                DeadlineCallbackState.OTHER_FAILURE,
+                id="failed_event",
+            ),
+            pytest.param(TriggerEvent({EVENT_STATE_KEY: "unknown_state"}), False, None, id="unknown_event"),
         ],

Review Comment:
   It was all except for 1 case but I've changed it to not have `expected_state` as parameter



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] AIP-86 - Add `callback_state` to deadline table [airflow]

Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk merged PR #53650:
URL: https://github.com/apache/airflow/pull/53650


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] AIP-86 - Add `callback_state` to deadline table [airflow]

Posted by "ramitkataria (via GitHub)" <gi...@apache.org>.
ramitkataria commented on code in PR #53650:
URL: https://github.com/apache/airflow/pull/53650#discussion_r2224028079


##########
airflow-core/tests/unit/models/test_deadline.py:
##########
@@ -231,10 +265,13 @@ def test_handle_callback_event(self, dagrun, session, event, none_trigger_id_exp
 
         deadline_orm.handle_callback_event(event, session)
         session.flush()
-        if none_trigger_id_expected:
-            assert deadline_orm.trigger_id is None
+
+        if none_trigger_expected:
+            assert deadline_orm.trigger is None
         else:
-            assert deadline_orm.trigger_id is not None
+            assert deadline_orm.trigger is not None

Review Comment:
   Thanks for catching that!



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] AIP-86 - Add `callback_state` to deadline table [airflow]

Posted by "ferruzzi (via GitHub)" <gi...@apache.org>.
ferruzzi commented on code in PR #53650:
URL: https://github.com/apache/airflow/pull/53650#discussion_r2223818187


##########
airflow-core/tests/unit/models/test_deadline.py:
##########
@@ -231,10 +265,13 @@ def test_handle_callback_event(self, dagrun, session, event, none_trigger_id_exp
 
         deadline_orm.handle_callback_event(event, session)
         session.flush()
-        if none_trigger_id_expected:
-            assert deadline_orm.trigger_id is None
+
+        if none_trigger_expected:
+            assert deadline_orm.trigger is None
         else:
-            assert deadline_orm.trigger_id is not None
+            assert deadline_orm.trigger is not None

Review Comment:
   Just a nit to prove I reviewed it :P  Feel free to resolve.  Those four lines could be replaced with 
   
   ```
   assert none_trigger_expected == (deadline_orm.trigger is None)
   ```



##########
airflow-core/tests/unit/models/test_deadline.py:
##########
@@ -210,13 +211,46 @@ def test_handle_miss_async_callback(self, dagrun, session):
 
     @pytest.mark.db_test
     @pytest.mark.parametrize(
-        "event, none_trigger_id_expected",
+        "event, none_trigger_expected, expected_state",
         [
-            pytest.param(TriggerEvent({"status": "success"}), True, id="success_event"),
-            pytest.param(TriggerEvent({"status": "some status"}), False, id="unknown_event"),
+            pytest.param(
+                TriggerEvent({EVENT_STATE_KEY: DeadlineCallbackState.SUCCESS, "result": "test_result"}),
+                True,
+                DeadlineCallbackState.SUCCESS,
+                id="success_event",
+            ),
+            pytest.param(
+                TriggerEvent({EVENT_STATE_KEY: DeadlineCallbackState.STARTED}),
+                False,
+                DeadlineCallbackState.STARTED,
+                id="started_event",
+            ),
+            pytest.param(
+                TriggerEvent(
+                    {EVENT_STATE_KEY: DeadlineCallbackState.NOT_FOUND, "message": "module not found"}
+                ),
+                True,
+                DeadlineCallbackState.NOT_FOUND,
+                id="not_found_event",
+            ),
+            pytest.param(
+                TriggerEvent({EVENT_STATE_KEY: DeadlineCallbackState.NOT_AWAITABLE}),
+                True,
+                DeadlineCallbackState.NOT_AWAITABLE,
+                id="not_awaitable_event",
+            ),
+            pytest.param(
+                TriggerEvent(
+                    {EVENT_STATE_KEY: DeadlineCallbackState.OTHER_FAILURE, "message": "error message"}
+                ),
+                True,
+                DeadlineCallbackState.OTHER_FAILURE,
+                id="failed_event",
+            ),
+            pytest.param(TriggerEvent({EVENT_STATE_KEY: "unknown_state"}), False, None, id="unknown_event"),
         ],

Review Comment:
   Any particular reason not to just pull `expected_state` from `event`?  It looks like every case being tested, the expected state is already right there in the event.  First line of the test could just be `expected_state = event[EVENT_STATE_KEY]` and save a bunch of redundancy, no?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org