Skip to content

Ports moveit1 #3689#3357

Merged
sjahr merged 6 commits intomoveit:mainfrom
riv-mjohnson:ports_moveit1_#3689
Feb 27, 2025
Merged

Ports moveit1 #3689#3357
sjahr merged 6 commits intomoveit:mainfrom
riv-mjohnson:ports_moveit1_#3689

Conversation

@riv-mjohnson
Copy link
Copy Markdown
Contributor

@riv-mjohnson riv-mjohnson commented Feb 21, 2025

Description

Ports moveit/moveit#3689, which avoids blocking the publishing of planning scenes during long operations, by copying planning scenes rather than locking the planning scene monitor.

Please backport to humble and jazzy when merged.

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

riv-mjohnson and others added 3 commits February 21, 2025 12:03
So far, the PSM's planning scene was locked during planning, thus stopping any PS updates in rviz.
Instead of locking the PSM's current scene, we use an independent clone of that scene for planning. To this end, PlanningSceneMonitor::copyPlanningScene() and ExecutableMotionPlan::copyPlanningScene() were added.
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Feb 21, 2025

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

Codecov Report

Attention: Patch coverage is 42.85714% with 12 lines in your changes missing coverage. Please review.

Project coverage is 46.24%. Comparing base (bb2eb75) to head (63af282).
Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
..._motion_planner/src/move_group_sequence_action.cpp 0.00% 3 Missing ⚠️
...lude/moveit/plan_execution/plan_representation.hpp 0.00% 3 Missing ⚠️
...motion_planner/src/move_group_sequence_service.cpp 0.00% 2 Missing ⚠️
...nning_scene_monitor/src/planning_scene_monitor.cpp 75.00% 2 Missing ⚠️
...rc/default_capabilities/move_action_capability.cpp 75.00% 1 Missing ⚠️
...ros/planning/moveit_cpp/src/planning_component.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             @@
##             main    #3357      +/-   ##
==========================================
+ Coverage   45.84%   46.24%   +0.40%     
==========================================
  Files         717      717              
  Lines       62573    62591      +18     
  Branches     7564     7566       +2     
==========================================
+ Hits        28680    28937     +257     
+ Misses      33726    33487     -239     
  Partials      167      167              

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

@sjahr sjahr added backport-humble Mergify label that triggers a PR backport to Humble backport-jazzy Mergify label that triggers a PR backport to Jazzy labels Feb 27, 2025
@sjahr sjahr added this pull request to the merge queue Feb 27, 2025
Merged via the queue into moveit:main with commit e2b24f5 Feb 27, 2025
9 checks passed
mergify bot pushed a commit that referenced this pull request Feb 27, 2025
* Renames .hpp files to .h to help cherry pick.

* Publish planning scene while planning (#3689)

So far, the PSM's planning scene was locked during planning, thus stopping any PS updates in rviz.
Instead of locking the PSM's current scene, we use an independent clone of that scene for planning. To this end, PlanningSceneMonitor::copyPlanningScene() and ExecutableMotionPlan::copyPlanningScene() were added.

* Renames .h files back to .hpp.

* Updates message types to ros2.

* Updates to use new variable names.

* Undoes erroneous autoformatting.

(cherry picked from commit e2b24f5)

# Conflicts:
#	moveit_planners/pilz_industrial_motion_planner/src/move_group_sequence_action.cpp
#	moveit_ros/move_group/src/default_capabilities/move_action_capability.cpp
#	moveit_ros/planning/moveit_cpp/src/planning_component.cpp
#	moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
#	moveit_ros/planning_interface/py_bindings_tools/include/moveit/py_bindings_tools/roscpp_initializer.h
mergify bot pushed a commit that referenced this pull request Feb 27, 2025
* Renames .hpp files to .h to help cherry pick.

* Publish planning scene while planning (#3689)

So far, the PSM's planning scene was locked during planning, thus stopping any PS updates in rviz.
Instead of locking the PSM's current scene, we use an independent clone of that scene for planning. To this end, PlanningSceneMonitor::copyPlanningScene() and ExecutableMotionPlan::copyPlanningScene() were added.

* Renames .h files back to .hpp.

* Updates message types to ros2.

* Updates to use new variable names.

* Undoes erroneous autoformatting.

(cherry picked from commit e2b24f5)
sea-bass pushed a commit that referenced this pull request Mar 6, 2025
(cherry picked from commit e2b24f5)

Co-authored-by: Mark Johnson <104826595+rr-mark@users.noreply.github.com>
sea-bass pushed a commit that referenced this pull request Mar 6, 2025
(cherry picked from commit e2b24f5)

Co-authored-by: Mark Johnson <104826595+rr-mark@users.noreply.github.com>
sussybot5258 pushed a commit to GreyCatAI/moveit2 that referenced this pull request Apr 19, 2025
* Renames .hpp files to .h to help cherry pick.

* Publish planning scene while planning (moveit#3689)

So far, the PSM's planning scene was locked during planning, thus stopping any PS updates in rviz.
Instead of locking the PSM's current scene, we use an independent clone of that scene for planning. To this end, PlanningSceneMonitor::copyPlanningScene() and ExecutableMotionPlan::copyPlanningScene() were added.

* Renames .h files back to .hpp.

* Updates message types to ros2.

* Updates to use new variable names.

* Undoes erroneous autoformatting.
Markus-Simonsen pushed a commit to Markus-Simonsen/moveit2 that referenced this pull request Aug 12, 2025
* Renames .hpp files to .h to help cherry pick.

* Publish planning scene while planning (moveit#3689)

So far, the PSM's planning scene was locked during planning, thus stopping any PS updates in rviz.
Instead of locking the PSM's current scene, we use an independent clone of that scene for planning. To this end, PlanningSceneMonitor::copyPlanningScene() and ExecutableMotionPlan::copyPlanningScene() were added.

* Renames .h files back to .hpp.

* Updates message types to ros2.

* Updates to use new variable names.

* Undoes erroneous autoformatting.
helen9975 pushed a commit to personalrobotics/moveit2 that referenced this pull request Feb 17, 2026
* Renames .hpp files to .h to help cherry pick.

* Publish planning scene while planning (moveit#3689)

So far, the PSM's planning scene was locked during planning, thus stopping any PS updates in rviz.
Instead of locking the PSM's current scene, we use an independent clone of that scene for planning. To this end, PlanningSceneMonitor::copyPlanningScene() and ExecutableMotionPlan::copyPlanningScene() were added.

* Renames .h files back to .hpp.

* Updates message types to ros2.

* Updates to use new variable names.

* Undoes erroneous autoformatting.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-humble Mergify label that triggers a PR backport to Humble backport-jazzy Mergify label that triggers a PR backport to Jazzy

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants