Skip to content

[20257] Add a keyed fragmented change to the reader data instance only when its completed (backport #4261)#4308

Merged
EduPonz merged 3 commits into2.6.xfrom
mergify/bp/2.6.x/pr-4261
Mar 4, 2024
Merged

[20257] Add a keyed fragmented change to the reader data instance only when its completed (backport #4261)#4308
EduPonz merged 3 commits into2.6.xfrom
mergify/bp/2.6.x/pr-4261

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 27, 2024

This is an automatic backport of pull request #4261 done by Mergify.
Cherry-pick of 9558ce4 has failed:

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

You are currently cherry-picking commit 9558ce436.
  (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/reader/StatefulReader.cpp
	modified:   src/cpp/rtps/reader/StatelessReader.cpp
	modified:   test/blackbox/api/dds-pim/PubSubReader.hpp
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
	modified:   test/blackbox/common/BlackboxTestsPubSubFragments.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/subscriber/history/DataReaderHistory.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

…ts completed (#4261)

* Refs #20257: Add regression test

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

* #Refs #20257: Fix

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

* Refs #20239: Second rev suggestions

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

* Refs #20257: Linter

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

* Refs #20257: Retrieve instance handle condition before for avoid being nullptr

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

---------

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

# Conflicts:
#	src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 27, 2024
@EduPonz EduPonz added this to the v2.6.8 milestone Jan 27, 2024
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test linux

@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test mac

@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test uncrustify

@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test discovery_server

@Mario-DL Mario-DL removed the conflicts Backport PR wich git cherry pick failed label Jan 30, 2024
@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test mac

1 similar comment
@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test mac

@Mario-DL
Copy link
Copy Markdown
Contributor

Mario-DL commented Feb 23, 2024

Rebasing its a pity as we would throw away all the job done in the already passed cis.
Asking a manual windows ci here

@Mario-DL
Copy link
Copy Markdown
Contributor

Mario-DL commented Mar 4, 2024

Failed tests were fixed in #4275 , giving it as ready-to-merge

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.

2 participants