Skip to content

fix: Fix lock order inversion / deadlock - #1010

Merged
jmachowinski merged 1 commit into
lyricalfrom
deadlock_fix_lyrical
Jul 20, 2026
Merged

fix: Fix lock order inversion / deadlock#1010
jmachowinski merged 1 commit into
lyricalfrom
deadlock_fix_lyrical

Conversation

@jmachowinski

Copy link
Copy Markdown
Contributor

Description

Lyrical backport of #1005

This fixes a deadlock if a guard condition was triggered while
a guard condition was being attached or detached.

Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
@mergify

mergify Bot commented Jul 17, 2026

Copy link
Copy Markdown

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@jmachowinski

Copy link
Copy Markdown
Contributor Author

Pulls: #1010
Gist: https://gist.githubusercontent.com/jmachowinski/8f98e830f2843fd54cc181bc78230b5d/raw/8cfeff1530c5a222ba24f9212ae289557816da34/ros2.repos
BUILD args: --cmake-args -DRMW_IMPLEMENTATION=rmw_zenoh_cpp
TEST args:
ROS Distro: lyrical
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/19888

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@jmachowinski
jmachowinski merged commit c5c101a into lyrical Jul 20, 2026
5 checks passed
@jmachowinski
jmachowinski deleted the deadlock_fix_lyrical branch July 20, 2026 09:07
@jmachowinski

jmachowinski commented Jul 20, 2026

Copy link
Copy Markdown
Contributor Author

@Mergifyio backport kilted jazzy humble

@mergify

mergify Bot commented Jul 20, 2026

Copy link
Copy Markdown

backport kilted jazzy humble

✅ Backports have been created

Details

ahcorde pushed a commit that referenced this pull request Jul 20, 2026
(cherry picked from commit c5c101a)

Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Co-authored-by: Janosch Machowinski <jmachowinski@users.noreply.github.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
ahcorde pushed a commit that referenced this pull request Jul 20, 2026
This fixes a deadlock if a guard condition was triggered while
a guard condition was being attached or detached.



(cherry picked from commit c5c101a)

Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Co-authored-by: Janosch Machowinski <jmachowinski@users.noreply.github.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
ahcorde added a commit that referenced this pull request Jul 20, 2026
* fix: Fix lock order inversion / deadlock (#1010)

This fixes a deadlock if a guard condition was triggered while
a guard condition was being attached or detached.

Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
(cherry picked from commit c5c101a)

* make linters happy

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>

---------

Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
Co-authored-by: Janosch Machowinski <jmachowinski@users.noreply.github.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Co-authored-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
doisyg pushed a commit to botsandus/rmw_zenoh that referenced this pull request Aug 9, 2026
This fixes a deadlock if a guard condition was triggered while
a guard condition was being attached or detached.

Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants