-
Notifications
You must be signed in to change notification settings - Fork 16.6k
Fix DbtCloudRunJobTrigger timeout error message and add final status check #61980
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
eran-moses-human
wants to merge
1
commit into
apache:main
Choose a base branch
from
eran-moses-human:fix/dbt-cloud-trigger-timeout-message
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -202,13 +202,13 @@ async def test_dbt_job_run_exception(self, mock_get_job_status, mocked_is_still_ | |
| @mock.patch("airflow.providers.dbt.cloud.triggers.dbt.DbtCloudRunJobTrigger.is_still_running") | ||
| @mock.patch("airflow.providers.dbt.cloud.hooks.dbt.DbtCloudHook.get_job_status") | ||
| async def test_dbt_job_run_timeout(self, mock_get_job_status, mocked_is_still_running): | ||
| """Assert that run timeout after end_time elapsed""" | ||
| """Assert that run yields a timeout error after end_time has elapsed.""" | ||
| mocked_is_still_running.return_value = True | ||
| mock_get_job_status.side_effect = Exception("Test exception") | ||
| end_time = time.time() | ||
| trigger = DbtCloudRunJobTrigger( | ||
| conn_id=self.CONN_ID, | ||
| poll_interval=self.POLL_INTERVAL, | ||
| poll_interval=0.1, | ||
| end_time=end_time, | ||
| run_id=self.RUN_ID, | ||
| account_id=self.ACCOUNT_ID, | ||
|
|
@@ -219,7 +219,35 @@ async def test_dbt_job_run_timeout(self, mock_get_job_status, mocked_is_still_ru | |
| { | ||
| "status": "error", | ||
| "message": f"Job run {self.RUN_ID} has not reached a terminal status " | ||
| f"after {end_time} seconds.", | ||
| f"within the configured timeout.", | ||
| "run_id": self.RUN_ID, | ||
| } | ||
| ) | ||
| assert expected == actual | ||
|
|
||
| @pytest.mark.asyncio | ||
| @mock.patch("airflow.providers.dbt.cloud.triggers.dbt.DbtCloudRunJobTrigger.is_still_running") | ||
| @mock.patch("airflow.providers.dbt.cloud.hooks.dbt.DbtCloudHook.get_job_status") | ||
| async def test_dbt_job_run_timeout_but_job_completes( | ||
| self, mock_get_job_status, mocked_is_still_running | ||
| ): | ||
| """Assert that a job completing at the timeout boundary is treated as success, not timeout.""" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: the docstring mentions "completing at the timeout boundary", but the test appears to simulate completion after the deadline has technically passed but before timeout emission. I would suggest clarifying it accordingly. |
||
| mocked_is_still_running.side_effect = [True, False] | ||
| mock_get_job_status.return_value = DbtCloudJobRunStatus.SUCCESS.value | ||
| end_time = time.time() | ||
| trigger = DbtCloudRunJobTrigger( | ||
| conn_id=self.CONN_ID, | ||
| poll_interval=0.1, | ||
| end_time=end_time, | ||
| run_id=self.RUN_ID, | ||
| account_id=self.ACCOUNT_ID, | ||
| ) | ||
| generator = trigger.run() | ||
| actual = await generator.asend(None) | ||
| expected = TriggerEvent( | ||
| { | ||
| "status": "success", | ||
| "message": f"Job run {self.RUN_ID} has completed successfully.", | ||
| "run_id": self.RUN_ID, | ||
| } | ||
| ) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like the timeout emission could be extended by
poll_interval, meaning the actual timeout could occur up to one full polling cycle later than the configured value. For example, withtimeout=60sandpoll_interval=30s, the timeout may not be emitted until around 90s depending on scheduling.I believe this behavior was already present prior to this PR, so it’s not a regression. That said, we might consider sleeping for
min(poll_interval, remaining_time)to align the timeout more closely with the configured value. This should not block the PR, but I think it might be worth exploring.