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

Handle on waiting #1562

Merged
merged 22 commits into from
Aug 14, 2024
Merged

Handle on waiting #1562

merged 22 commits into from
Aug 14, 2024

Conversation

bmagyar
Copy link
Member

@bmagyar bmagyar commented Jun 5, 2024

Conflict resolved from #1483

@bmagyar bmagyar mentioned this pull request Jun 5, 2024
Closed
@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 25, 2024

This pull request is in conflict. Could you fix it @bmagyar?

@wittenator
Copy link

We tested this PR (adding back in line 228 in controller_manager/controller_manager/spawner.py) and we were able to run ros2_control over a FastDDS discovery server.

@fmauch fmauch mentioned this pull request Aug 12, 2024
Merged
@fmauch
Copy link
Contributor

fmauch commented Aug 12, 2024

As written in different comments I think this needs some points to be addressed. I've updated thinks on my fork for cherry-picking.

If you create a PR to fix/spawner-interrupt, we could directly merge them in.

Done in #1666

@christophfroehlich
Copy link
Contributor

christophfroehlich commented Aug 12, 2024 •
edited
Loading

Note for myself: squash + merge from a PR with merge commits into another PR is not a good idea.

@codecov Codecov
Copy link

codecov bot commented Aug 12, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 2.12766% with 46 lines in your changes missing coverage. Please review.

Project coverage is 84.60%. Comparing base (07fb4f3) to head (921c106).
Report is 2 commits behind head on master.

Files Patch % Lines
.../controller_manager/controller_manager_services.py 0.00% 18 Missing ⚠️
...ler_manager/controller_manager/hardware_spawner.py 0.00% 13 Missing ⚠️
controller_manager/controller_manager/spawner.py 0.00% 9 Missing ⚠️
controller_manager/controller_manager/unspawner.py 0.00% 6 Missing ⚠️
Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #1562   +/-   ##
=======================================
  Coverage   84.59%   84.60%           
=======================================
  Files         115      115           
  Lines       10537    10459   -78     
  Branches      972      965    -7     
=======================================
- Hits         8914     8849   -65     
+ Misses       1295     1284   -11     
+ Partials      328      326    -2
Flag Coverage Δ
unittests 84.60% <2.12%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
controller_manager/test/test_spawner_unspawner.cpp 100.00% <100.00%> (+1.01%) ⬆️
controller_manager/controller_manager/unspawner.py 0.00% <0.00%> (ø)
controller_manager/controller_manager/spawner.py 0.00% <0.00%> (ø)
...ler_manager/controller_manager/hardware_spawner.py 0.00% <0.00%> (ø)
.../controller_manager/controller_manager_services.py 0.00% <0.00%> (ø)

@christophfroehlich christophfroehlich mentioned this pull request Aug 14, 2024
Closed
@destogl destogl added backport-humble This label should be used by maintaines only! Label triggers PR backport to ROS2 humble. backport-iron This label should be used by maintaines only! Label triggers PR backport to ROS2 Iron. labels Aug 14, 2024
saikishor
saikishor approved these changes Aug 14, 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

@destogl destogl merged commit af4b48f into master Aug 14, 2024
21 checks passed
@destogl destogl deleted the fix/spawner-interrupt branch August 14, 2024 15:24
mergify bot pushed a commit that referenced this pull request Aug 14, 2024
@bmagyar @mergify
Handle waiting in Spawner and align Hardware Spawner functionality (#…
0487379 
…1562)

(cherry picked from commit af4b48f)

# Conflicts:
#	controller_manager/controller_manager/controller_manager_services.py
#	controller_manager/controller_manager/hardware_spawner.py
#	controller_manager/controller_manager/spawner.py
#	controller_manager/doc/userdoc.rst
#	controller_manager/test/test_spawner_unspawner.cpp
mergify bot pushed a commit that referenced this pull request Aug 14, 2024
@bmagyar @mergify
Handle waiting in Spawner and align Hardware Spawner functionality (#…
b48df96 
…1562)

(cherry picked from commit af4b48f)

# Conflicts:
#	controller_manager/controller_manager/spawner.py
#	controller_manager/test/test_spawner_unspawner.cpp
This was referenced Aug 14, 2024
Merged
Merged
@fmauch fmauch mentioned this pull request Aug 14, 2024
Merged
This was referenced Aug 15, 2024
Closed
Closed
destogl added a commit that referenced this pull request Aug 15, 2024
@mergify @bmagyar @destogl
Handle on waiting (backport #1562) (#1681)
41723d2 
* Handle waiting in Spawner and align Hardware Spawner functionality (#1562)

(cherry picked from commit af4b48f)

---------

Co-authored-by: Bence Magyar <bence.magyar.robotics@gmail.com>
Co-authored-by: Dr. Denis <denis@stoglrobotics.de>
destogl added a commit that referenced this pull request Aug 15, 2024
@mergify @bmagyar @destogl
Handle on waiting (backport #1562) (#1680)
ade1bdd 
* Handle waiting in Spawner and align Hardware Spawner functionality (#1562)

(cherry picked from commit af4b48f)

---------

Co-authored-by: Bence Magyar <bence.magyar.robotics@gmail.com>
Co-authored-by: Dr. Denis <denis@stoglrobotics.de>
This was referenced Aug 19, 2024
Merged
Merged
@christophfroehlich christophfroehlich mentioned this pull request Oct 13, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmauch fmauch fmauch requested changes

@destogl destogl destogl approved these changes

@saikishor saikishor saikishor approved these changes

@christophfroehlich christophfroehlich christophfroehlich left review comments

@DasRoteSkelett DasRoteSkelett Awaiting requested review from DasRoteSkelett

@erickisos erickisos Awaiting requested review from erickisos

@jaron-l jaron-l Awaiting requested review from jaron-l

@moriarty moriarty Awaiting requested review from moriarty

Assignees
No one assigned
Labels
backport-humble This label should be used by maintaines only! Label triggers PR backport to ROS2 humble. backport-iron This label should be used by maintaines only! Label triggers PR backport to ROS2 Iron.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@bmagyar @wittenator @christophfroehlich @fmauch @destogl @saikishor @Timple