Skip to content

move TrajectoryExecutionManager::clear() to private - #3226

Merged
sea-bass merged 2 commits into
moveit:mainfrom
patrickKXMD:traj_exec_clear
Jan 12, 2025
Merged

sea-bass merged 2 commits into
moveit:mainfrom
patrickKXMD:traj_exec_clear

Conversation

@patrickKXMD

@patrickKXMD patrickKXMD commented Jan 10, 2025 •

Copy link
Copy Markdown
Contributor

Description

previously discussed here #3198 (comment)

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

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
@codecov-commenter

codecov-commenter commented Jan 10, 2025 •

Copy link
Copy Markdown

⚠️ 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 45.64%. Comparing base (a77eb98) to head (1b82272).
Report is 4 commits behind head on main.

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

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3226      +/-   ##
==========================================
- Coverage   45.67%   45.64%   -0.02%     
==========================================
  Files         714      714              
  Lines       62299    62293       -6     
  Branches     7531     7529       -2     
==========================================
- Hits        28446    28425      -21     
- Misses      33687    33701      +14     
- Partials      166      167       +1     

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

@rhaschke rhaschke left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I generally approve.

@sea-bass sea-bass added backport-humble Mergify label that triggers a PR backport to Humble backport-jazzy Mergify label that triggers a PR backport to Jazzy labels Jan 12, 2025
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
@patrickKXMD

Copy link
Copy Markdown
Contributor Author

Updated with suggestions applied, thanks!

@sea-bass
sea-bass added this pull request to the merge queue Jan 12, 2025
Merged via the queue into moveit:main with commit 3ec75ab Jan 12, 2025
mergify Bot pushed a commit that referenced this pull request Jan 12, 2025
* move TrajectoryExecutionManager::clear() to private

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>

---------

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
(cherry picked from commit 3ec75ab)

# Conflicts:
#	moveit_py/src/moveit/moveit_ros/trajectory_execution_manager/trajectory_execution_manager.cpp
#	moveit_ros/move_group/src/default_capabilities/execute_trajectory_action_capability.cpp
#	moveit_ros/planning/plan_execution/src/plan_execution.cpp
#	moveit_ros/planning/trajectory_execution_manager/include/moveit/trajectory_execution_manager/trajectory_execution_manager.hpp
mergify Bot pushed a commit that referenced this pull request Jan 12, 2025
* move TrajectoryExecutionManager::clear() to private

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>

---------

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
(cherry picked from commit 3ec75ab)
sea-bass pushed a commit that referenced this pull request Jan 12, 2025
Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
(cherry picked from commit 3ec75ab)

Co-authored-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
rhaschke pushed a commit to ubi-agni/moveit that referenced this pull request Jan 12, 2025
sea-bass pushed a commit that referenced this pull request Jan 12, 2025
…3237)

(cherry picked from commit 3ec75ab)

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
sussybot5258 pushed a commit to GreyCatAI/moveit2 that referenced this pull request Apr 19, 2025
* move TrajectoryExecutionManager::clear() to private

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>

---------

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
Markus-Simonsen pushed a commit to Markus-Simonsen/moveit2 that referenced this pull request Aug 12, 2025
* move TrajectoryExecutionManager::clear() to private

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>

---------

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
rhaschke added a commit to moveit/moveit that referenced this pull request Aug 24, 2025
* Fix race condition when stopping trajectory execution
   backport of moveit/moveit2#3198
* Move TrajectoryExecutionManager::clear() to private
   backport of moveit/moveit2#3226
helen9975 pushed a commit to personalrobotics/moveit2 that referenced this pull request Feb 17, 2026
* move TrajectoryExecutionManager::clear() to private

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>

---------

Signed-off-by: Dongya Jiang <1983534+patrickKXMD@users.noreply.github.com>
Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
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.

4 participants