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

[20933] Set DataSharing in Writer|ReaderProxyData (backport #4761) #4801

Merged
merged 2 commits into from
May 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2024

Description

Previously, Writer|ReaderProxyData always reported DataSharing as AUTO. This PR set it to ON or OFF based on the PID_DATASHARING.

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

  • N/A 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.

This is an automatic backport of pull request #4761 done by [Mergify](https://mergify.com).

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

mergify bot commented May 17, 2024

Cherry-pick of 904c523 has failed:

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

You are currently cherry-picking commit 904c52302.
  (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/core/policy/QosPoliciesSerializer.hpp
	modified:   src/cpp/rtps/builtin/data/ReaderProxyData.cpp
	modified:   src/cpp/rtps/builtin/data/WriterProxyData.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/rtps/builtin/BuiltinDataSerializationTests.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

@JesusPoderoso JesusPoderoso added this to the v2.14.2 milestone May 17, 2024
elianalf and others added 2 commits May 17, 2024 14:10
* Refs #20933: Set datasharing on when pid is found

Signed-off-by: elianalf <[email protected]>

* Refs #20933: Set datasharing off after the clear

Signed-off-by: elianalf <[email protected]>

* Refs #20933: Add tests

Signed-off-by: elianalf <[email protected]>

* Refs #20933: Fix other_vendor_parameter_list_with_custom_pids test

Signed-off-by: elianalf <[email protected]>

* Refs #20933: Change implementation to fix failing tests

Signed-off-by: elianalf <[email protected]>

* Refs #20933: Apply suggestions

Signed-off-by: elianalf <[email protected]>

---------

Signed-off-by: elianalf <[email protected]>
(cherry picked from commit 904c523)

# Conflicts:
#	test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
@EduPonz EduPonz force-pushed the mergify/bp/2.14.x/pr-4761 branch from a50a4bf to dd190fe Compare May 17, 2024 12:10
@EduPonz EduPonz self-requested a review May 17, 2024 12:10
@EduPonz EduPonz removed the conflicts Backport PR wich git cherry pick failed label May 17, 2024
@EduPonz EduPonz requested review from EduPonz and removed request for EduPonz May 17, 2024 12:11
@github-actions github-actions bot added the ci-pending PR which CI is running label May 17, 2024
Copy link

@EduPonz EduPonz left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@elianalf
Copy link
Contributor

@richiprosima please test this

@EduPonz EduPonz merged commit 0cfbf33 into 2.14.x May 20, 2024
15 of 22 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.14.x/pr-4761 branch May 20, 2024 09:17
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.

3 participants