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

[20625] Monitor service properly managing instances (backport #4564) #4612

Merged
merged 2 commits into from
Mar 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2024

Description

This PR fixes a misbehavior of the monitor service that was not truly managing instances since it requires a DataWriterHistory instead of a WriterHistory. Cachechanges owned by instances are now properly removed in successive updates to the same instance.

@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.

  • 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 #4564 done by [Mergify](https://mergify.com).

* Refs #20625: Add BB tests

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #20625: Add Monitor Service Fix. Use DataWriterHistory

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #20625: Fix MonitorService Unittests

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #20625: Apply rev suggestion

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #20625: Add more comments in BB tests

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 84960eb)

# Conflicts:
#	test/unittest/statistics/rtps/CMakeLists.txt
Copy link
Contributor Author

mergify bot commented Mar 25, 2024

Cherry-pick of 84960eb has failed:

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

You are currently cherry-picking commit 84960eba0.
  (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/statistics/rtps/monitor-service/MonitorService.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
	new file:   test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/statistics/rtps/CMakeLists.txt

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 Mar 25, 2024
@JesusPoderoso JesusPoderoso added this to the v2.13.4 milestone Mar 25, 2024
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Mar 25, 2024
Signed-off-by: JesusPoderoso <[email protected]>
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@JesusPoderoso
Copy link
Contributor

Even though Mac CI has not run in Jenkins, the other CI issues are unrelated to this PR.
Considering it 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 Mar 27, 2024
@EduPonz EduPonz merged commit 6d39ec1 into 2.13.x Mar 28, 2024
12 of 15 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-4564 branch March 28, 2024 08:49
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.

3 participants