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

[20706] Make reader get_first_untaken_info() coherent with read()/take() #4696

Merged
merged 3 commits into from
Apr 19, 2024

Conversation

Mario-DL
Copy link
Member

@Mario-DL Mario-DL commented Apr 17, 2024

Description

This PR corrects the behavior of get_first_untaken_info() so that it retrieves the first valid cache change (checking whether the change is in the future or not), instead of just returning the first one in the instance (sorted by sourcetimestamp).
In the scenario of having multiple reliable writers and one reader with history size > 1 in the same topic, it can happen that get_first_untaken_info() returns OK (as it is not currently checking whether the change is in the future) but take() returns NO_DATA because the change is in the future.

In addition, a brief doxygen documentation is added to be aware that the method is meant to be followed by a read() or take() since it does not modify the status condition of the entity.

@Mergifyio backport 2.13.x 2.10.x 2.6.x

Fixes ros2/rmw_fastrtps#749

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.

@Mario-DL Mario-DL added this to the v2.14.1 milestone Apr 17, 2024
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@MiguelCompany MiguelCompany self-requested a review April 18, 2024 07:04
@github-actions github-actions bot added the ci-pending PR which CI is running label Apr 18, 2024
Copy link
Contributor

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

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

lgtm! @Mario-DL thanks for the fix!

@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

Unrelated failures. Going in.

@MiguelCompany MiguelCompany merged commit 5fbd88e into master Apr 19, 2024
11 of 17 checks passed
@MiguelCompany MiguelCompany deleted the fix/20706 branch April 19, 2024 11:49
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.13.x 2.10.x 2.6.x

Copy link
Contributor

mergify bot commented Apr 19, 2024

mergify bot pushed a commit that referenced this pull request Apr 19, 2024
* Refs #20706: Add regression BB test

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

* Refs #20706: Fix

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

* Refs #20706: Apply review suggestions

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 5fbd88e)
mergify bot pushed a commit that referenced this pull request Apr 19, 2024
* Refs #20706: Add regression BB test

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

* Refs #20706: Fix

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

* Refs #20706: Apply review suggestions

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 5fbd88e)
mergify bot pushed a commit that referenced this pull request Apr 19, 2024
* Refs #20706: Add regression BB test

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

* Refs #20706: Fix

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

* Refs #20706: Apply review suggestions

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 5fbd88e)
MiguelCompany pushed a commit that referenced this pull request Apr 19, 2024
…#4707)

* Refs #20706: Add regression BB test

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

* Refs #20706: Fix

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

* Refs #20706: Apply review suggestions

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 5fbd88e)

Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
MiguelCompany pushed a commit that referenced this pull request Apr 23, 2024
…#4708)

* Make `get_first_untaken_info()` coherent with `read()/take()` (#4696)

* Refs #20706: Add regression BB test

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

* Refs #20706: Fix

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

* Refs #20706: Apply review suggestions

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 5fbd88e)

* Refs #20706: test fix

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>
EduPonz pushed a commit that referenced this pull request May 9, 2024
…#4706)

* Refs #20706: Add regression BB test

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

* Refs #20706: Fix

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

* Refs #20706: Apply review suggestions

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 5fbd88e)

Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sometimes heavy CPU load
4 participants