Skip to content

Fix action server deadlock issue that caused by other mutexes locked in CancelCallback (backport #1635)#1646

Merged
ivanpauno merged 1 commit intogalacticfrom
mergify/bp/galactic/pr-1635
Apr 30, 2021
Merged

Fix action server deadlock issue that caused by other mutexes locked in CancelCallback (backport #1635)#1646
ivanpauno merged 1 commit intogalacticfrom
mergify/bp/galactic/pr-1635

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2021

This is an automatic backport of pull request #1635 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

…in CancelCallback (#1635)

* Fix deadlock issue that caused by other mutexes locked in CancelCallback

Signed-off-by: Kaven Yau <love29881460@qq.com>

* Add unit test for rclcpp action server deadlock

Signed-off-by: Kaven Yau <love29881460@qq.com>

* Update rclcpp_action/test/test_server.cpp

Co-authored-by: William Woodall <william+github@osrfoundation.org>

Co-authored-by: Kaven Yau <love29881460@qq.com>
Co-authored-by: Jacob Perron <jacob@openrobotics.org>
Co-authored-by: William Woodall <william+github@osrfoundation.org>
(cherry picked from commit fba080c)
@ivanpauno ivanpauno merged commit 82e4e72 into galactic Apr 30, 2021
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/galactic/pr-1635 branch April 30, 2021 18:04
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.

5 participants