Skip to content

[20227] Prevent index overflow and correctly assert the end iterator in DataSharing (backport #4321) - #4404

Merged
MiguelCompany merged 1 commit into
2.6.xfrom
mergify/bp/2.6.x/pr-4321
Mar 1, 2024
Merged

MiguelCompany merged 1 commit into
2.6.xfrom
mergify/bp/2.6.x/pr-4321

Conversation

@mergify

@mergify mergify Bot commented Feb 20, 2024

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #4321 done by Mergify.
Cherry-pick of 66de89e has failed:

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

You are currently cherry-picking commit 66de89eac.
  (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/DataSharing/DataSharingPayloadPool.cpp
	modified:   src/cpp/rtps/DataSharing/ReaderPool.hpp
	modified:   test/dds/communication/CMakeLists.txt
	modified:   test/dds/communication/PubSubMain.cpp
	modified:   test/dds/communication/PublisherMain.cpp
	modified:   test/dds/communication/PublisherModule.hpp
	modified:   test/dds/communication/SubscriberMain.cpp
	modified:   test/dds/communication/SubscriberModule.cpp
	modified:   test/dds/communication/SubscriberModule.hpp
	modified:   test/dds/communication/definitions_example.json
	new file:   test/dds/communication/simple_data_sharing_stress.json
	modified:   test/dds/communication/test_build.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/dds/communication/PublisherModule.cpp

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

@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Feb 20, 2024
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Feb 20, 2024
@JesusPoderoso

Copy link
Copy Markdown
Contributor

@Mario-DL Please, can you address the conflicts?

@Mario-DL
Mario-DL force-pushed the mergify/bp/2.6.x/pr-4321 branch from c9f26fc to c40028e Compare February 20, 2024 08:54
@Mario-DL Mario-DL added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Feb 20, 2024
@Mario-DL

Copy link
Copy Markdown
Contributor

@richiprosima please test this

โ€ฆharing (#4321)

* Refs #20227: Add DDS communication test

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

* Refs #20227: Prevent history index to overflow history size

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

* Refs #20227: Correctly assert the current end

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

* Refs #20227: Linter

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

* Refs #20227: Initialize test timeout argument properly

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

* Refs #20227: Rev suggestion

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Mario-DL force-pushed the mergify/bp/2.6.x/pr-4321 branch from c40028e to 9f80ee9 Compare February 23, 2024 08:15
@Mario-DL

Copy link
Copy Markdown
Contributor

@richiprosima please test linux

@Mario-DL

Mario-DL commented Mar 1, 2024 •

Copy link
Copy Markdown
Contributor

Failed tests were already fixed in #4275

@Mario-DL Mario-DL 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 1, 2024
@MiguelCompany
MiguelCompany merged commit eb831fc into 2.6.x Mar 1, 2024
@MiguelCompany
MiguelCompany deleted the mergify/bp/2.6.x/pr-4321 branch March 1, 2024 11:23
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