Skip to content

Resolves merge conflicts.#3322

Merged
sea-bass merged 3 commits intomoveit:mergify/bp/humble/pr-3283from
riv-mjohnson:mergify/bp/humble/pr-3283
Feb 6, 2025
Merged

Resolves merge conflicts.#3322
sea-bass merged 3 commits intomoveit:mergify/bp/humble/pr-3283from
riv-mjohnson:mergify/bp/humble/pr-3283

Conversation

@riv-mjohnson
Copy link
Copy Markdown
Contributor

Description

Please explain the changes you made, including a reference to the related issue if applicable

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

@mergify
Copy link
Copy Markdown

mergify bot commented Feb 6, 2025

Please target the main branch for development, we will backport the changes to mergify/bp/humble/pr-3283 for you if approved and if they don't break API.

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Feb 6, 2025

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

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.34%. Comparing base (044b5ad) to head (2730e4f).
Report is 1 commits behind head on mergify/bp/humble/pr-3283.

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

Additional details and impacted files
@@                      Coverage Diff                       @@
##           mergify/bp/humble/pr-3283    #3322       +/-   ##
==============================================================
+ Coverage                           0   51.34%   +51.34%     
==============================================================
  Files                              0      382      +382     
  Lines                              0    31874    +31874     
==============================================================
+ Hits                               0    16363    +16363     
- Misses                             0    15511    +15511     

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

@sea-bass sea-bass merged commit edebe26 into moveit:mergify/bp/humble/pr-3283 Feb 6, 2025
7 checks passed
sea-bass pushed a commit that referenced this pull request Feb 6, 2025
* Ports moveit #3676 and #3682 (#3283)

* Use separate callback queue + spinner for ExecuteTrajectoryAction (#3676)

This allows parallel execution + planning.

Also required modifying updateSceneWithCurrentState() to allow skipping a scene update with a new robot state (from CurrentStateMonitor), if the planning scene is currently locked (due to planning).
Otherwise, the CurrentStateMonitor would block too.

Co-authored-by: Robert Haschke <rhaschke@techfak.uni-bielefeld.de>

* PSM: simplify state_update_pending_ (#3682)

* Move update of state_update_pending_ to updateSceneWithCurrentState()

* Revert to try_lock

While there are a few other locks except explicit user locks (getPlanningSceneServiceCallback(), collisionObjectCallback(), attachObjectCallback(), newPlanningSceneCallback(), and scenePublishingThread()), these occur rather seldom
(scenePublishingThread() publishes at 2Hz).

Hence, we might indeed balance a non-blocking CSM vs. missed PS updates in favour of CSM.

* Don't block for scene update from stateUpdateTimerCallback too

The timer callback and CSM's state update callbacks are served from the same callback queue, which would block CSM again.

* further locking adaptations

reading dt_state_update_ and last_robot_state_update_wall_time_
does not lead to logic errors, but at most to a skipped or redundant update on corrupted data.
Alternatively we could be on the safe side and turn both variables into std::atomic, but that
would effectively mean locks on every read.

Instead, only set state_update_pending_ as an atomic, which is lockfree in this case.

Co-authored-by: Michael Görner <me@v4hn.de>

* Ports changes to ROS2.

---------

Co-authored-by: Robert Haschke <rhaschke@techfak.uni-bielefeld.de>
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
Co-authored-by: Michael Görner <me@v4hn.de>
Co-authored-by: Sebastian Castro <4603398+sea-bass@users.noreply.github.com>
Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
(cherry picked from commit ba35aaa)

# Conflicts:
#	moveit_ros/move_group/src/default_capabilities/execute_trajectory_action_capability.cpp
#	moveit_ros/planning/planning_scene_monitor/include/moveit/planning_scene_monitor/planning_scene_monitor.hpp
#	moveit_ros/planning/planning_scene_monitor/src/planning_scene_monitor.cpp

* Resolves merge conflicts. (#3322)

* Resolves merge conflicts.

* Undoes erroneous auto-format.

* Undoes erroneous auto-format.

---------

Co-authored-by: Mark Johnson <104826595+rr-mark@users.noreply.github.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.

3 participants