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

[20849] New max_message_size property to limit output datagrams size (backport #4777) #4806

Merged
merged 1 commit into from
May 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 18, 2024

Description

This PR adds the parsing of max_message_size property in RTPS Writer and RTPS Participant.

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.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.
  • Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • Changes are ABI compatible.
  • Changes are API compatible.
  • New feature has been added to the versions.md file (if applicable).
  • 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 #4777 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label May 18, 2024
Copy link
Contributor Author

mergify bot commented May 18, 2024

Cherry-pick of 6d20b64 has failed:

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

You are currently cherry-picking commit 6d20b649b.
  (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:   include/fastdds/rtps/writer/RTPSWriter.h
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   src/cpp/rtps/writer/RTPSWriter.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsBasic.cpp
	modified:   test/blackbox/common/RTPSBlackboxTestsBasic.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.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

@MiguelCompany MiguelCompany added this to the v2.13.5 milestone May 18, 2024
@elianalf elianalf requested a review from JesusPoderoso May 20, 2024 05:33
@elianalf elianalf force-pushed the mergify/bp/2.13.x/pr-4777 branch from a6c5945 to 76c5ac4 Compare May 20, 2024 05:42
@elianalf elianalf removed the conflicts Backport PR wich git cherry pick failed label May 20, 2024
@elianalf elianalf requested review from JesusPoderoso and removed request for JesusPoderoso May 20, 2024 05:43
@github-actions github-actions bot added the ci-pending PR which CI is running label May 20, 2024
@elianalf elianalf force-pushed the mergify/bp/2.13.x/pr-4777 branch from 76c5ac4 to 8abdb54 Compare May 20, 2024 06:44
* Refs #20489. Parse property in RTPS writer.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20849. Parse property in RTPS participant.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20849: Add test for RTPS writer

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20849: Add test for participant

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20849: Apply suggestions

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20849: Uncrustify

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20849: Apply suggestions

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20849: Add tests in DDS layer

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20849: Apply suggestions

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
@elianalf elianalf force-pushed the mergify/bp/2.13.x/pr-4777 branch from 8abdb54 to 7e3f29e Compare May 20, 2024 07:02
@JesusPoderoso JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso May 20, 2024 10:08
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@elianalf
Copy link
Contributor

@richiprosima please test linux

Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM

@JesusPoderoso
Copy link
Contributor

CI issues unrelated to PR content
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 May 23, 2024
@EduPonz EduPonz merged commit 32463d7 into 2.13.x May 24, 2024
12 of 16 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-4777 branch May 24, 2024 06:32
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.

4 participants