[23655] Solve TCP disconnect while incomplete read deadlock (backport #6066)#6090
Merged
juanlofer-eprosima merged 1 commit into3.3.xfrom Oct 13, 2025
Merged
[23655] Solve TCP disconnect while incomplete read deadlock (backport #6066)#6090juanlofer-eprosima merged 1 commit into3.3.xfrom
juanlofer-eprosima merged 1 commit into3.3.xfrom
Conversation
* Refs #23655. Add regression test Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23655. Solve deadlock and improve thread safety Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23655. Bonus track: protect status getter Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23655. Fix test in Windows Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23655. Remove deprecated code Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23655. Restore noexcept overloads usage Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Refs #23655. Apply suggestions Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> (cherry picked from commit f2e173c)
11 tasks
Contributor
Author
🧪 CI InsightsHere's what we observed from your CI run for 2cd2c01. ❌ Job Failures
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 PR attempts to solve the deadlock produced when a read operation never completes (e.g. peer blocks before ending a transmission), and the TCP channel resource is disconnected (normally on closure while cleaning the associated transport).
Summing up, the solution consists in shutting down the socket before acquiring the culprit read mutex, so that any ongoing write/read operations are aborted even if not completed.
In addition, some other changes in this PR target general thread safety and attempt to improve overall resilience:
@Mergifyio backport 3.3.x 3.2.x 2.14.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
N/a 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 backport compatible: they do NOT break ABI nor change library core behavior.
Changes are API compatible.
N/a New feature has been added to the
versions.mdfile (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
This is an automatic backport of pull request #6066 done by [Mergify](https://mergify.com).