-
Notifications
You must be signed in to change notification settings - Fork 765
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
Revert "TCP deadlock on channel reuse (#4099)" #4181
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cferreiragonz
previously approved these changes
Dec 20, 2023
This reverts commit dd4c434. Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
EduPonz
force-pushed
the
hotfix/revert_4099
branch
from
December 21, 2023 11:24
1a9cddd
to
b1b78a3
Compare
cferreiragonz
approved these changes
Dec 21, 2023
@richiprosima please test this |
@richiprosima please test mac |
@Mergifyio backport 2.12.x 2.11.x 2.10.x |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Dec 22, 2023
* 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
* 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
mergify bot
pushed a commit
that referenced
this pull request
Dec 22, 2023
* 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
EduPonz
added a commit
that referenced
this pull request
Jan 9, 2024
* 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
* 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
pushed a commit
that referenced
this pull request
Jan 11, 2024
* 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)
EduPonz
added a commit
that referenced
this pull request
Jan 12, 2024
* 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>
MiguelCompany
pushed a commit
that referenced
this pull request
Jan 30, 2024
* 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
* 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
* 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This reverts #4099 since it has introduced deadlocks in TCP.
@Mergifyio backport 2.12.x 2.11.x 2.10.x
Contributor Checklist
versions.md
file (if applicable).Reviewer Checklist