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

Also handle SIGTERM gracefully #2747

Merged
merged 4 commits into from
Feb 1, 2025
Merged

Also handle SIGTERM gracefully #2747

merged 4 commits into from
Feb 1, 2025

Conversation

erlingrj
Copy link
Contributor

🦟 Bug fix

Fixes #2738

Summary

As proposed by @azeey, in addition to SIGINT, also catch SIGTERM, which is the default signal sent when trying to stop a process externally.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

@erlingrj erlingrj requested a review from mjcarroll as a code owner January 30, 2025 10:21
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label Jan 30, 2025
@erlingrj erlingrj mentioned this pull request Jan 30, 2025
Closed
azeey
azeey approved these changes Jan 30, 2025
View reviewed changes
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

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

Nice! Thanks for the contribution. Do you mind fixing the signoff (DCO) issue? Otherwise, this is looks good to me.

azeey
azeey reviewed Jan 30, 2025
View reviewed changes
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

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

There also some whitespace issues caught by the linter

src/cmd/cmdsim.rb.in Outdated Show resolved Hide resolved
src/cmd/cmdsim.rb.in Outdated Show resolved Hide resolved
erlingrj and others added 3 commits January 30, 2025 17:37
@erlingrj
Also handle SIGTERM gracefully
3e94e69 
Signed-off-by: Erling Rennemo Jellum
Signed-off-by: erlingrj <[email protected]>
@erlingrj @azeey
Update src/cmd/cmdsim.rb.in
0503ae0 
Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: erling <[email protected]>
Signed-off-by: erlingrj <[email protected]>
@erlingrj @azeey
Update src/cmd/cmdsim.rb.in
7f5cad9 
Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: erling <[email protected]>
Signed-off-by: erlingrj <[email protected]>
@azeey
Copy link
Contributor

azeey commented Feb 1, 2025

Going to merge without windows CI since we keep losing the windows nodes and this PR is low risk.

@azeey azeey merged commit 13bf5be into gazebosim:gz-sim9 Feb 1, 2025
10 of 11 checks passed
@azeey
Copy link
Contributor

azeey commented Feb 1, 2025

@Mergifyio backport gz-sim8 ign-gazebo6

@mergify Mergify
Copy link
Contributor

mergify bot commented Feb 1, 2025 •
edited
Loading

backport gz-sim8 ign-gazebo6

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Feb 1, 2025
@erlingrj @mergify
Also handle SIGTERM gracefully (#2747)
d828e46 
Signed-off-by: Erling Rennemo Jellum
Signed-off-by: erlingrj <[email protected]>
Signed-off-by: erling <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
(cherry picked from commit 13bf5be)
@mergify mergify bot mentioned this pull request Feb 1, 2025
Merged
8 tasks
mergify bot pushed a commit that referenced this pull request Feb 1, 2025
@erlingrj @mergify
Also handle SIGTERM gracefully (#2747)
6b89daa 
Signed-off-by: Erling Rennemo Jellum
Signed-off-by: erlingrj <[email protected]>
Signed-off-by: erling <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
(cherry picked from commit 13bf5be)

# Conflicts:
#	src/cmd/cmdgazebo.rb.in
@mergify mergify bot mentioned this pull request Feb 1, 2025
Open
8 tasks
azeey pushed a commit that referenced this pull request Feb 1, 2025
@erlingrj @azeey
Also handle SIGTERM gracefully (#2747)
26a0e0f 
Signed-off-by: Erling Rennemo Jellum
Signed-off-by: erlingrj <[email protected]>
Signed-off-by: erling <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
(cherry picked from commit 13bf5be)
azeey added a commit that referenced this pull request Feb 1, 2025
@erlingrj @azeey @iche033
Also handle SIGTERM gracefully (#2747)
0ae5c05 
Signed-off-by: Erling Rennemo Jellum
Signed-off-by: erlingrj <[email protected]>
Signed-off-by: erling <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
(cherry picked from commit 13bf5be)
Signed-off-by: Addisu Z. Taddese <[email protected]>
azeey pushed a commit that referenced this pull request Feb 4, 2025
@erlingrj @azeey
Also handle SIGTERM gracefully (#2747)
d6b107b 
Signed-off-by: Erling Rennemo Jellum
Signed-off-by: erlingrj <[email protected]>
Signed-off-by: erling <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
(cherry picked from commit 13bf5be)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azeey azeey azeey approved these changes

@iche033 iche033 iche033 approved these changes

@mjcarroll mjcarroll Awaiting requested review from mjcarroll mjcarroll is a code owner

Assignees
No one assigned
Labels
🏛️ ionic Gazebo Ionic
Projects
Core development
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Terminating gazebo leaves many zombie processes
3 participants
@erlingrj @azeey @iche033