Skip to content

[20086] Methods to configure transport scenarios (backport #4098) #4172

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

Merged
merged 12 commits into from
Feb 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 19, 2023

This is an automatic backport of pull request #4098 done by Mergify.
Cherry-pick of 8cbd461 has failed:

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

You are currently cherry-picking commit 8cbd46144.
  (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:
	new file:   include/fastdds/rtps/attributes/BuiltinTransports.hpp
	modified:   include/fastrtps/xmlparser/XMLParserCommon.h
	modified:   src/cpp/CMakeLists.txt
	modified:   src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp
	new file:   src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
	modified:   src/cpp/rtps/xmlparser/XMLParser.cpp
	modified:   src/cpp/rtps/xmlparser/XMLParserCommon.cpp
	new file:   src/cpp/utils/string_utilities.hpp
	modified:   test/blackbox/CMakeLists.txt
	modified:   test/blackbox/api/dds-pim/PubSubReader.hpp
	modified:   test/blackbox/api/dds-pim/PubSubWriter.hpp
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
	new file:   test/blackbox/builtin_transports_profile.xml
	modified:   test/blackbox/common/BlackboxTestsTransportCustom.cpp
	new file:   test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
	modified:   test/unittest/dds/participant/CMakeLists.txt
	modified:   test/unittest/dds/participant/ParticipantTests.cpp
	modified:   test/unittest/dds/publisher/CMakeLists.txt
	modified:   test/unittest/dds/status/CMakeLists.txt
	modified:   test/unittest/xmlparser/XMLElementParserTests.cpp
	modified:   test/unittest/xmlparser/wrapper/XMLParserTest.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/dds/domain/qos/DomainParticipantQos.hpp
	both modified:   include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
	both modified:   include/fastrtps/xmlparser/XMLParser.h
	both modified:   resources/xsd/fastRTPS_profiles.xsd
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	both modified:   src/cpp/rtps/xmlparser/XMLElementParser.cpp
	both modified:   test/unittest/dynamic_types/CMakeLists.txt
	both modified:   test/unittest/statistics/dds/CMakeLists.txt
	both modified:   test/unittest/xmlparser/CMakeLists.txt
	both modified:   versions.md

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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 19, 2023
@elianalf elianalf added this to the v2.11.3 milestone Dec 19, 2023
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Dec 20, 2023
@cferreiragonz
Copy link
Contributor

@richiprosima please test this

* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

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

* Refs #20055: Separate builtin transports tests into individual cases

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

* Refs #20055: Mark large_data tests as flaky due to TCP

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

---------

Signed-off-by: EduPonz <[email protected]>
(cherry picked from commit 5e87eb3)
@cferreiragonz
Copy link
Contributor

cferreiragonz commented Jan 11, 2024

The changes of #4181 corresponding to builtin transports have been cherry-picked to this PR and deleted from #4193

@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.11.x/pr-4098 branch from d254e26 to 639c6e9 Compare January 11, 2024 11:17
EduPonz
EduPonz previously approved these changes Jan 12, 2024
@EduPonz
Copy link

EduPonz commented Jan 12, 2024

@richiprosima please test this

@Mario-DL
Copy link
Member

I ordered a manual Sanitizer analysis here since it seems to consistently complain in these backports despite test errors seems unrelated

@Mario-DL
Copy link
Member

@richiprosima please test mac

@Mario-DL
Copy link
Member

Ordering a manual Sanitizer analysis here just in case the 2.11.x branch is already failing

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@Mario-DL
Copy link
Member

IMO There are some leaks that seems related to this PR that we should take a look at

@Mario-DL
Copy link
Member

Ordering here a new Sanitizer run on this PR. This time I am using the master workflow instead of the one in 2.11.x

@JesusPoderoso
Copy link
Contributor

This PR introduced tests fail in Windows CI (both Github actions and Jenkins)
Can you take a look @cferreiragonz?

MiguelCompany and others added 7 commits January 25, 2024 12:58
* Refs #20020. Added enumeration for possible builtin transports configuration.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Add method to parse environment variable.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Cleanup RTPSParticipantAttributes.h.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Moved default transports configuration into RTPSParticipantAttributes::setup_transports.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. RTPSParticipantImpl constructor uses private copy of attributes.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for DEFAULTv6.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. SHM transport added before UDP.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for SHM.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for UDPv4.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for UDPv6.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Factor out duplicated code.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for LARGE_DATA.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added support for LARGE_DATAv6.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020. Added DomainParticipantQos::setup_transports.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20020: Add constants for builtin transports

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

* Refs #20020: Add XML parser functions for builtin_transports

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

* Refs #20020: add builtinTransports to .xsd

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

* Refs #20020: add mock tests needed

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

* Refs #20020: Add builtin transports XML file

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

* Refs #20020: Add new API to tests classes

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

* Refs #20020: Add Blackbox tests

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

* Refs 20020: Rename XML file and EOF

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

* Refs #20020: Add unittest test

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

* Refs #20020: Update versions.md

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

* Refs #20020: Make enum uint16_t

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

* Refs #20020: Add Parsing test

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

* Refs #20020: Apply minor changes

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

* Refs #20020: Remove - in CMakeLists

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

* Refs #20020: Uncrustify

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

* Refs #20020: Fix .xsd and remove unnecesary mock test

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

* Refs #20020: Add implementation for mock test

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

* Refs #20020: Fix windows build

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

* Refs #20020: Uncrustify

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

* Disable v6 tests for Mac

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

---------

Signed-off-by: Miguel Company <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: elianalf <[email protected]>
Co-authored-by: cferreiragonz <[email protected]>
Co-authored-by: elianalf <[email protected]>
(cherry picked from commit 8cbd461)

# Conflicts:
#	include/fastdds/dds/domain/qos/DomainParticipantQos.hpp
#	include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
#	include/fastrtps/xmlparser/XMLParser.h
#	resources/xsd/fastRTPS_profiles.xsd
#	src/cpp/rtps/participant/RTPSParticipantImpl.cpp
#	src/cpp/rtps/xmlparser/XMLElementParser.cpp
#	test/unittest/dynamic_types/CMakeLists.txt
#	test/unittest/statistics/dds/CMakeLists.txt
#	test/unittest/xmlparser/CMakeLists.txt
#	versions.md
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
@JesusPoderoso
Copy link
Contributor

JesusPoderoso commented Jan 25, 2024

This PR has been rebased on top of

To properly compare the CI. Changing PR base accordingly

@JesusPoderoso JesusPoderoso changed the base branch from 2.11.x to mergify/bp/2.11.x/pr-4181 January 25, 2024 12:02
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

Base automatically changed from mergify/bp/2.11.x/pr-4181 to 2.11.x February 1, 2024 09:51
@MiguelCompany
Copy link
Member

The errors in the asan job are 3 instances of the same error (a leak in the SecurityManager) which is not related to the changes in this PR.

Other failures seem unrelated

@MiguelCompany MiguelCompany merged commit faede7f into 2.11.x Feb 1, 2024
@MiguelCompany MiguelCompany deleted the mergify/bp/2.11.x/pr-4098 branch February 1, 2024 09:52
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.

6 participants