Skip to content
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

DockerSwarmOperator: Support line breaks in service logs #40705

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

mr1holmes
Copy link

@mr1holmes mr1holmes commented Jul 10, 2024

closes: #40571


Since we use splitlines() on the decoded log string to split logs in lines,
If the log line is

b'2024-07-09T19:07:04.587918327Z \r  0%|          | 0/1000 [00:00<?, ?it/s]\r  0%|          | 1/1000 [00:00<01:40,  9.98it/s]

The stream_new_logs function treats it as three separate log lines, which leads to failure in finding timestamp in carriage return separated lines.

This PR changes the initial log pre-processing.
Since the log generator provided by docker's service_logs is already separating log lines we don't need to use splitlines().

Copy link

boring-cyborg bot commented Jul 10, 2024

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contributors' Guide (https://github.com/apache/airflow/blob/main/contributing-docs/README.rst)
Here are some useful points:

  • Pay attention to the quality of your code (ruff, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it's a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
  • Always keep your Pull Requests rebased, otherwise your build might fail due to changes not related to your commits.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@mr1holmes mr1holmes changed the title fix: DockerSwarmOperator: Support carriage return in logs DockerSwarmOperator: Support line breaks in service logs Jul 11, 2024
@mr1holmes mr1holmes marked this pull request as ready for review July 11, 2024 20:01
@mr1holmes
Copy link
Author

Please review

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DockerSwarmOperator does not work well with Python's tqdm when displaying logs
1 participant