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

[20862] Improve ThreadSettingsQoS logging (backport #4744) #4755

Merged
merged 1 commit into from
May 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 7, 2024

Description

@Mergifyio backport 2.13.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • Any new/modified methods have been properly documented using Doxygen.

  • Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are ABI compatible.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #4744 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented May 7, 2024

Cherry-pick of 7832901 has failed:

On branch mergify/bp/2.13.x/pr-4744
Your branch is up to date with 'origin/2.13.x'.

You are currently cherry-picking commit 7832901d3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	modified:   src/cpp/utils/threading.hpp
	modified:   src/cpp/utils/threading/threading_empty.ipp
	modified:   src/cpp/utils/threading/threading_osx.ipp
	modified:   src/cpp/utils/threading/threading_pthread.ipp
	modified:   test/blackbox/api/dds-pim/PubSubWriter.hpp
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
	new file:   test/blackbox/common/DDSBlackboxTestsThreadSettingsQos.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/utils/threading/threading_win32.ipp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label May 7, 2024
@mergify mergify bot mentioned this pull request May 7, 2024
13 tasks
@JesusPoderoso JesusPoderoso added this to the v2.13.5 milestone May 8, 2024
* Refs #20862: Add BB tests

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20862: ThreadSettings logging improvements impl

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20862: Linter

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20862: Apply Miguel suggestions

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20862: Apply second rev

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20862: Applied third round suggestions

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20862: Remove old method in threading_empty

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 7832901)
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label May 20, 2024
@JesusPoderoso JesusPoderoso self-requested a review May 20, 2024 06:49
@github-actions github-actions bot added the ci-pending PR which CI is running label May 20, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@JesusPoderoso
Copy link
Contributor

CI issues are unrelated to the PR content
Ready to merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels May 23, 2024
@EduPonz EduPonz merged commit e56f749 into 2.13.x May 24, 2024
12 of 16 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-4744 branch May 24, 2024 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants