Fix waiting the base container when reading the logs of other containers#33092
Merged
hussein-awala merged 2 commits intoapache:mainfrom Aug 4, 2023
Merged
Conversation
jedcunningham
approved these changes
Aug 4, 2023
amoghrajesh
approved these changes
Aug 4, 2023
Comment on lines
+1265
to
+1274
|
|
||
| # check that the base container is not included in the logs | ||
| mock_fetch_log.assert_called_once_with( | ||
| pod=pod, container_logs=["some_init_container"], follow_logs=True | ||
| ) | ||
| # check that KPO waits for the base container to complete before proceeding to extract XCom | ||
| mock_await_container_completion.assert_called_once_with(pod=pod, container_name="base") | ||
| # check that we wait for the xcom sidecar to start before extracting XCom | ||
| mock_await_xcom_sidecar.assert_called_once_with(pod=pod) | ||
|
|
Contributor
There was a problem hiding this comment.
Awesome work on the test cases!
Member
Author
Most unit tests don't expect to call the method |
hussein-awala
added a commit
to hussein-awala/airflow
that referenced
this pull request
Aug 4, 2023
… containers (apache#33092)" This reverts commit d31c775.
hussein-awala
added a commit
to hussein-awala/airflow
that referenced
this pull request
Aug 4, 2023
…of other containers (apache#33092)" (apache#33125)" This reverts commit 4fbbdbc.
potiuk
pushed a commit
that referenced
this pull request
Aug 4, 2023
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
related: #31663
After supporting specifying the containers list to read logs from (#31663), we can configure the KPO to load the init containers logs, or even provide a wrong name by mistake. In these cases, the KPO will not wait for the base container termination, and if we set
do_xcom_pushto True, the xcom_sidecar container will be running too fast, and it will fail because the Xcom result is not ready yet.This PR calls the method
await_container_completionregardless if we read the log or not, to make sure that we don't proceed to extract the Xcom result before checking if the bas container is finished.^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in newsfragments.