Skip to content

[16608] Fix total_unread_ consistent with reader's history upon get_first_untaken_info() (backport #3203)#3218

Merged
MiguelCompany merged 8 commits into2.7.xfrom
mergify/bp/2.7.x/pr-3203
Jan 25, 2023
Merged

[16608] Fix total_unread_ consistent with reader's history upon get_first_untaken_info() (backport #3203)#3218
MiguelCompany merged 8 commits into2.7.xfrom
mergify/bp/2.7.x/pr-3203

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 17, 2023

This is an automatic backport of pull request #3203 done by Mergify.
Cherry-pick of de5cd9c has failed:

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

You are currently cherry-picking commit de5cd9c2e.
  (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/fastdds/subscriber/history/DataReaderHistory.cpp
	modified:   test/blackbox/api/dds-pim/PubSubWriter.hpp
	modified:   test/blackbox/common/DDSBlackboxTestsDataReader.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/api/dds-pim/PubSubReader.hpp
	both modified:   test/blackbox/common/DDSBlackboxTestsBasic.cpp

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Mario-DL and others added 7 commits January 18, 2023 10:18
…taken_info (#3203)

* Refs 16608: Added BlackBoxTest

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

* Refs 16608: Fix. Make get_first_untaken_info() a read-only API call

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

* Refs #16608: Fix tsan warning

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

* Refs #16608: Applied suggested changes

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

* Refs #16608: Applied second-reviewed suggested changes

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

* Refs #16608: Skip test for Data-Sharing

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

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit de5cd9c)
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL force-pushed the mergify/bp/2.7.x/pr-3203 branch from 2c56446 to 5354b31 Compare January 18, 2023 09:19
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jan 18, 2023
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@MiguelCompany
Copy link
Copy Markdown
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit de60542 into 2.7.x Jan 25, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.7.x/pr-3203 branch January 25, 2023 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants