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.

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

Fix unload of controllers when spawned with --unload-on-kill (backport #1717) #1842

Merged
merged 1 commit into from
Nov 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 3, 2024

Fix the bug, when using --unload-on-kill option, the spawner only unloads the last controller instead of all the controllers. This PR proposes a solution to fix the above issue


This is an automatic backport of pull request #1717 done by Mergify.

Copy link
Contributor Author

mergify bot commented Nov 3, 2024

Cherry-pick of 9e57adf has failed:

On branch mergify/bp/humble/pr-1717
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 9e57adf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/controller_manager/spawner.py
	both modified:   controller_manager/test/test_spawner_unspawner.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Nov 3, 2024
@saikishor saikishor force-pushed the mergify/bp/humble/pr-1717 branch from 2ef793a to 9bfa9b7 Compare November 3, 2024 17:24
Copy link

codecov bot commented Nov 3, 2024

Codecov Report

Attention: Patch coverage is 54.54545% with 10 lines in your changes missing coverage. Please review.

Project coverage is 62.57%. Comparing base (d897740) to head (9bfa9b7).
Report is 2 commits behind head on humble.

Files with missing lines Patch % Lines
controller_manager/controller_manager/spawner.py 45.45% 4 Missing and 2 partials ⚠️
controller_manager/test/test_spawner_unspawner.cpp 63.63% 1 Missing and 3 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1842      +/-   ##
==========================================
- Coverage   62.58%   62.57%   -0.01%     
==========================================
  Files         108      108              
  Lines       12026    12041      +15     
  Branches     8133     8145      +12     
==========================================
+ Hits         7526     7535       +9     
- Misses        880      882       +2     
- Partials     3620     3624       +4     
Flag Coverage Δ
unittests 62.57% <54.54%> (-0.01%) ⬇️

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

Files with missing lines Coverage Δ
controller_manager/test/test_spawner_unspawner.cpp 58.89% <63.63%> (+0.15%) ⬆️
controller_manager/controller_manager/spawner.py 68.46% <45.45%> (-0.59%) ⬇️

@saikishor saikishor enabled auto-merge (squash) November 3, 2024 17:38
@saikishor saikishor merged commit d62377e into humble Nov 3, 2024
9 of 11 checks passed
@saikishor saikishor deleted the mergify/bp/humble/pr-1717 branch November 3, 2024 17:40
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.

2 participants