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/spawner interrupt #1666

Merged
merged 26 commits into from
Aug 12, 2024
Merged

Fix/spawner interrupt #1666

merged 26 commits into from
Aug 12, 2024

Conversation

fmauch
Copy link
Contributor

@fmauch fmauch commented Aug 12, 2024

This contains a conflict-resolving merge and a couple of commits implementing comments in #1562

  • Merge in current master to resolve merge conflicts
  • Fix tests to set a timeout when needed
  • Exit more gracefully when the CM services cannot be found without printing a stack trace

saikishor and others added 26 commits July 16, 2024 09:47
@saikishor
[ResourceManager] Make destructor virtual for use in derived classes (r…
7be0c6a 
…os-controls#1607)
@Parker-Drouillard
Fix typos in test_resource_manager.cpp (ros-controls#1609)
1f8ca08
@destogl @fmauch @christophfroehlich
[CM] Remove support for the description parameter and use only `robot…
9d1aff9 
…_description` topic (ros-controls#1358)

---------

Co-authored-by: Felix Exner <[email protected]>
Co-authored-by: Christoph Froehlich <[email protected]>
@saikishor
move critical variables to the private context (ros-controls#1623)
152d19b
@saikishor
Fix controller starting with later load of robot description test (ro…
0792a35 
…s-controls#1624)

* Fix the duplicated restart of the controller_manager services initialization

* Scope the ControllerManagerRunner to avoid malloc and other test issues

* reorder the tests for consistent log at the end
@christophfroehlich
Remove noqa (ros-controls#1626)
b7bbdd6
@henrygerardmoore
Unused header cleanup (ros-controls#1627)
6631270
@firesurfer @saikishor @christophfroehlich
Create debugging.rst (ros-controls#1625)
89292e3 
---------

Co-authored-by: Sai Kishor Kothakota <[email protected]>
Co-authored-by: Christoph Froehlich <[email protected]>
@bmagyar
Update changelogs
65cd1c5
@bmagyar
4.14.0
b3852da
@saikishor
add missing rclcpp logging include for Humble compatibility build (ro…
3bc4e45 
…s-controls#1635)
@saikishor
[CM] Remove deprecated spawner args (ros-controls#1639)
3eae727
@christophfroehlich
Add a pytest launch file to test ros2_control_node (ros-controls#1636)
872029c
@christophfroehlich
Fix rst markup (ros-controls#1642)
742a9fd 
* Fix rqt_cm paragraph

* Fix indent
@christophfroehlich
CM: Add missing includes (ros-controls#1641)
df43a1c
@saikishor
[RM] Add get_hardware_info method to the Hardware Components (ros-c…
d3d1c95 
…ontrols#1643)
@saikishor
Fix the namespaced controller_manager spawner + added tests (ros-cont…
5cd1a43 
…rols#1640)
@github-actions @christophfroehlich
Bump version of pre-commit hooks (ros-controls#1649)
4210767 
Co-authored-by: christophfroehlich <[email protected]>
@christophfroehlich
Add missing include for executors (ros-controls#1653)
774f053
@bmagyar
Update changelogs
054a4ed
@bmagyar
4.15.0
32e471a
@saikishor
refactor SwitchParams to fix the incosistencies in the spawner tests (r…
a1ad523 
…os-controls#1638)
@fmauch
Merge remote-tracking branch 'origin/master' into fix/spawner-interrupt
383569b
@fmauch
Modify test with missing CM to have a timeout
27f44d7
@fmauch
Catch exception when CM services are not found
16396bd 
And print the error and exit in the application
@fmauch
Exit with code 1 on unreached CM
3d67dfa
@mergify Mergify
Copy link
Contributor

mergify bot commented Aug 12, 2024

@fmauch, all pull requests must be targeted towards the master development branch.
Once merged into master, it is possible to backport to fix/spawner-interrupt, but it must be in master
to have these changes reflected into new distributions.

@fmauch fmauch mentioned this pull request Aug 12, 2024
Merged
saikishor
saikishor approved these changes Aug 12, 2024
View reviewed changes
Copy link
Member

@saikishor saikishor left a comment

Choose a reason for hiding this comment

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

LGTM

@christophfroehlich christophfroehlich merged commit 4044fc2 into ros-controls:fix/spawner-interrupt Aug 12, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saikishor saikishor saikishor approved these changes

@bmagyar bmagyar Awaiting requested review from bmagyar

@destogl destogl Awaiting requested review from destogl

@livanov93 livanov93 Awaiting requested review from livanov93

@progtologist progtologist Awaiting requested review from progtologist

@VanshGehlot VanshGehlot Awaiting requested review from VanshGehlot

@VX792 VX792 Awaiting requested review from VX792

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

Successfully merging this pull request may close these issues.
8 participants
@fmauch @saikishor @christophfroehlich @Parker-Drouillard @destogl @henrygerardmoore @firesurfer @bmagyar