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

Fix: Resolve race condition in MoveGroupSequenceAction (backport #3125) #3127

Merged
merged 3 commits into from
Nov 22, 2024
Merged

Fix: Resolve race condition in MoveGroupSequenceAction (backport #3125) #3127

merged 3 commits into from
Nov 22, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 22, 2024

Description

Replaced ReentrantCallbackGroup with MutuallyExclusiveCallbackGroup in MoveGroupSequenceAction::initialize to prevent race conditions during stress testing.

This change ensures sequential execution of callbacks, avoiding issues caused by concurrent execution.

Reference: #3117

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers
This is an automatic backport of pull request #3125 done by [Mergify](https://mergify.com).

@maxwelllls @mergify
Fix: Resolve race condition in MoveGroupSequenceAction (#3125)
03caacc 
(cherry picked from commit 6d94dfb)

# Conflicts:
#	moveit_planners/pilz_industrial_motion_planner/src/move_group_sequence_action.cpp
@mergify mergify bot added the conflicts label Nov 22, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Nov 22, 2024

Cherry-pick of 6d94dfb has failed:

On branch mergify/bp/humble/pr-3125
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 6d94dfb71.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_planners/pilz_industrial_motion_planner/src/move_group_sequence_action.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@sea-bass sea-bass mentioned this pull request Nov 22, 2024
Merged
6 tasks
@codecov-commenter
Copy link

codecov-commenter commented Nov 22, 2024 •
edited
Loading

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 42.28%. Comparing base (92e8808) to head (e1b218b).
Report is 1 commits behind head on humble.

Files with missing lines Patch % Lines
..._motion_planner/src/move_group_sequence_action.cpp 0.00% 1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files 
@@            Coverage Diff             @@
##           humble    #3127       /-   ##
==========================================
  Coverage   42.26%   42.28%    0.03%     
==========================================
  Files         668      668              
  Lines       57741    57742        1     
  Branches     7322     7323        1     
==========================================
  Hits        24396    24410       14     
  Misses      33159    33147      -12     
  Partials      186      185       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚨 Try these New Features:

@sea-bass sea-bass merged commit ed38b2d into humble Nov 22, 2024
7 checks passed
@sea-bass sea-bass deleted the mergify/bp/humble/pr-3125 branch November 22, 2024 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sea-bass sea-bass sea-bass approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@codecov-commenter @sea-bass @maxwelllls