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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
Dec 22, 2023
Merged

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

merged 3 commits into from
Dec 22, 2023

Conversation

EduPonz
Copy link

@EduPonz EduPonz commented Dec 20, 2023 •
edited by MiguelCompany
Loading

Description

This reverts #4099 since it has introduced deadlocks in TCP.

@Mergifyio backport 2.12.x 2.11.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • N/A 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
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • 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

  • N/A The PR has a milestone assigned.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

cferreiragonz
cferreiragonz previously approved these changes Dec 20, 2023
View reviewed changes
@cferreiragonz cferreiragonz modified the milestone: v2.13.1 Dec 20, 2023
@EduPonz
Revert "TCP deadlock on channel reuse (#4099)"
af60473 
This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz
Refs #20055: Separate builtin transports tests into individual cases
0e1b690 
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz
Refs #20055: Mark large_data tests as flaky due to TCP
b1b78a3 
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz
Copy link
Author

EduPonz commented Dec 21, 2023

@richiprosima please test this

@EduPonz
Copy link
Author

EduPonz commented Dec 22, 2023

@richiprosima please test mac

@EduPonz
Copy link
Author

EduPonz commented Dec 22, 2023

@Mergifyio backport 2.12.x 2.11.x 2.10.x

@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 22, 2023 •
edited
Loading

backport 2.12.x 2.11.x 2.10.x

✅ Backports have been created

@MiguelCompany MiguelCompany merged commit 5e87eb3 into master Dec 22, 2023
10 of 14 checks passed
@MiguelCompany MiguelCompany deleted the hotfix/revert_4099 branch December 22, 2023 09:27
mergify bot pushed a commit that referenced this pull request Dec 22, 2023
@EduPonz @mergify
Revert "TCP deadlock on channel reuse (#4099)" (#4181)
3061995 
* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5e87eb3)

# Conflicts:
#	test/blackbox/common/BlackboxTestsTransportCustom.cpp
#	test/blackbox/xfail_tests.cmake
mergify bot pushed a commit that referenced this pull request Dec 22, 2023
@EduPonz @mergify
Revert "TCP deadlock on channel reuse (#4099)" (#4181)
8755858 
* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5e87eb3)

# Conflicts:
#	test/blackbox/common/BlackboxTestsTransportCustom.cpp
#	test/blackbox/xfail_tests.cmake
This was referenced Dec 22, 2023
Merged
Merged
mergify bot pushed a commit that referenced this pull request Dec 22, 2023
@EduPonz @mergify
Revert "TCP deadlock on channel reuse (#4099)" (#4181)
135851f 
* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5e87eb3)

# Conflicts:
#	test/blackbox/common/BlackboxTestsTransportCustom.cpp
#	test/blackbox/xfail_tests.cmake
@mergify mergify bot mentioned this pull request Dec 22, 2023
Merged
EduPonz added a commit that referenced this pull request Jan 9, 2024
@EduPonz
Revert "TCP deadlock on channel reuse (#4099)" (#4181)
306c0e7 
* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
cferreiragonz pushed a commit that referenced this pull request Jan 11, 2024
@EduPonz @cferreiragonz
Revert "TCP deadlock on channel reuse (#4099)" (#4181)
b521c14 
* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5e87eb3)
@cferreiragonz cferreiragonz mentioned this pull request Jan 11, 2024
Merged
cferreiragonz pushed a commit that referenced this pull request Jan 11, 2024
@EduPonz @cferreiragonz
Revert "TCP deadlock on channel reuse (#4099)" (#4181)
e34f53b 
* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5e87eb3)
@cferreiragonz cferreiragonz mentioned this pull request Jan 11, 2024
Merged
EduPonz added a commit that referenced this pull request Jan 12, 2024
@mergify @EduPonz
Revert "TCP deadlock on channel reuse (#4099)" (#4181) (#4194)
f8737c1 
* Revert "TCP deadlock on channel reuse (#4099)" (#4181)

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

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Add XFAIL_FASTRTPS.list file

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
@duca duca mentioned this pull request Jan 25, 2024
Closed
MiguelCompany pushed a commit that referenced this pull request Jan 30, 2024
@mergify @EduPonz
Revert "TCP deadlock on channel reuse (#4099)" (#4181) (#4192)
930457e 
* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5e87eb3)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Feb 1, 2024
@mergify @EduPonz
Revert "TCP deadlock on channel reuse (#4099)" (#4181) (#4193)
f0d4d19 
* Revert "TCP deadlock on channel reuse (#4099)"

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5e87eb3)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
MiguelCompany added a commit that referenced this pull request Feb 1, 2024
@mergify @EduPonz
@MiguelCompany @cferreiragonz
Methods to configure transport scenarios (#4098) (#4172)
faede7f 
* Revert "TCP deadlock on channel reuse (#4099)" (#4181)

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

This reverts commit dd4c434.

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5e87eb3)

* Methods to configure transport scenarios (#4098)

* Refs #20020. Added enumeration for possible builtin transports configuration.

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

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

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

* Refs #20020. Cleanup RTPSParticipantAttributes.h.

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

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

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

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

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

* Refs #20020. Added support for DEFAULTv6.

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

* Refs #20020. SHM transport added before UDP.

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

* Refs #20020. Added support for SHM.

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

* Refs #20020. Added support for UDPv4.

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

* Refs #20020. Added support for UDPv6.

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

* Refs #20020. Factor out duplicated code.

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

* Refs #20020. Added support for LARGE_DATA.

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

* Refs #20020. Added support for LARGE_DATAv6.

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

* Refs #20020. Added DomainParticipantQos::setup_transports.

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

* Refs #20020: Add constants for builtin transports

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Add XML parser functions for builtin_transports

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: add builtinTransports to .xsd

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: add mock tests needed

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Add builtin transports XML file

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Add new API to tests classes

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Add Blackbox tests

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs 20020: Rename XML file and EOF

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Add unittest test

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

* Refs #20020: Update versions.md

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Make enum uint16_t

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Add Parsing test

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Apply minor changes

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Remove - in CMakeLists

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Uncrustify

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

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

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Add implementation for mock test

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Fix windows build

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20020: Uncrustify

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Disable v6 tests for Mac

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Co-authored-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: elianalf <62831776+elianalf@users.noreply.github.com>
(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

* Fix Conflicts: dpqos

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix Conflicts: XMLParser

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix Conflicts: RTPSParticipant

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix Conflicts: Tests

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix Conflicts others

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Cherry-pick c46518643

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix Conflicts: versions.md

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix dns filter

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Mark large_data tests as flaky due to TCP

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: cferreiragonz <carlosferreira@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cferreiragonz cferreiragonz cferreiragonz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@EduPonz @cferreiragonz @MiguelCompany