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

[14752] Fix WLP deadlock #2715

Merged
merged 2 commits into from
Jun 29, 2022
Merged

[14752] Fix WLP deadlock #2715

merged 2 commits into from
Jun 29, 2022

Conversation

JLBuenoLopez
Copy link
Contributor

Signed-off-by: JLBuenoLopez-eProsima [email protected]

Description

Partial backport of #2712. This backport only affects the WLP deadlock.

@Mergifyio backport 2.3.x 2.1.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.
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Fast DDS test suite has been run locally.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A Documentation builds and tests pass locally.
  • 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.

Reviewer Checklist

  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@JLBuenoLopez
Refs #14752: fix WLP deadlock
a50485c 
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
@JLBuenoLopez JLBuenoLopez added this to the v2.5.2 milestone Jun 2, 2022
@JLBuenoLopez
Copy link
Contributor Author

@Mergifyio backport 2.3.x 2.1.x

@mergify
Copy link
Contributor

mergify bot commented Jun 2, 2022

backport 2.3.x 2.1.x

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@JLBuenoLopez
Refs #14752: linters
512b464 
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
@MiguelCompany MiguelCompany merged commit 01a55d4 into 2.5.x Jun 29, 2022
@MiguelCompany MiguelCompany deleted the hotfix/db-deadlock-backport-2.5.x branch June 29, 2022 10:33
mergify bot pushed a commit that referenced this pull request Jun 29, 2022
@JLBuenoLopez @mergify
Fix WLP deadlock (#2715)
138a03f 
* Refs #14752: fix WLP deadlock

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #14752: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit 01a55d4)

# Conflicts:
#	src/cpp/rtps/reader/StatefulReader.cpp
#	src/cpp/rtps/reader/StatelessReader.cpp
@mergify mergify bot mentioned this pull request Jun 29, 2022
Merged
mergify bot pushed a commit that referenced this pull request Jun 29, 2022
@JLBuenoLopez @mergify
Fix WLP deadlock (#2715)
b5392df 
* Refs #14752: fix WLP deadlock

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #14752: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit 01a55d4)

# Conflicts:
#	src/cpp/rtps/reader/StatefulReader.cpp
#	src/cpp/rtps/reader/StatelessReader.cpp
@mergify mergify bot mentioned this pull request Jun 29, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Jun 29, 2022

backport 2.3.x 2.1.x

✅ Backports have been created

JLBuenoLopez added a commit that referenced this pull request Jul 21, 2022
@JLBuenoLopez
Fix WLP deadlock (#2715)
918fad1 
* Refs #14752: fix WLP deadlock

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #14752: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit 01a55d4)

# Conflicts:
#	src/cpp/rtps/reader/StatefulReader.cpp
#	src/cpp/rtps/reader/StatelessReader.cpp
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
JLBuenoLopez added a commit that referenced this pull request Jul 21, 2022
@JLBuenoLopez
Fix WLP deadlock (#2715)
aa58da5 
* Refs #14752: fix WLP deadlock

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #14752: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit 01a55d4)

# Conflicts:
#	src/cpp/rtps/reader/StatefulReader.cpp
#	src/cpp/rtps/reader/StatelessReader.cpp
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
MiguelCompany pushed a commit that referenced this pull request Jul 21, 2022
@mergify @JLBuenoLopez
Fix WLP deadlock (#2789)
accad5c 
* Fix WLP deadlock (#2715)

* Refs #14752: fix WLP deadlock

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #14752: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit 01a55d4)

# Conflicts:
#	src/cpp/rtps/reader/StatefulReader.cpp
#	src/cpp/rtps/reader/StatelessReader.cpp
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #15163: fix conflicts

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #15163: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #15163: fix conflict

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #15163: fix conflict

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

Co-authored-by: José Luis Bueno López <[email protected]>
Co-authored-by: JLBuenoLopez-eProsima <[email protected]>
MiguelCompany pushed a commit that referenced this pull request Jul 21, 2022
@mergify @JLBuenoLopez
Fix WLP deadlock (#2788)
326c410 
* Fix WLP deadlock (#2715)

* Refs #14752: fix WLP deadlock

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #14752: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit 01a55d4)

# Conflicts:
#	src/cpp/rtps/reader/StatefulReader.cpp
#	src/cpp/rtps/reader/StatelessReader.cpp
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #15160: fix conflicts

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

Co-authored-by: José Luis Bueno López <[email protected]>
Co-authored-by: JLBuenoLopez-eProsima <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.5.2
Development

Successfully merging this pull request may close these issues.
2 participants
@JLBuenoLopez @MiguelCompany