Fix graceful shutdown of containers fixes #947 #3890
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dtrudg
requested changes
Dec 8, 2025
Member
dtrudg
left a comment
dtrudg
left a comment
There was a problem hiding this comment.
Thanks for the attempted fix. Haven't had a chance to look into it in depth, but from the test failures, something isn't quite right.
The e2e tests are now timing out...
Given that there's a RunSingularity call blocked for 29 minutes, it looks like the change is causing a deadlock for a / some tests...
goroutine 297 [chan receive, 29 minutes]:
testing.(*T).Run(0xc00080e000, {0xc000586ae0, 0x14}, 0xc0004a1bf0)
testing/testing.go:2005 +0x9fe
github.com/sylabs/singularity/v4/e2e/internal/e2e.TestEnv.RunSingularity({{0xc00043b100, 0x1a}, {0xc000a40540, 0x1e}, {0xc0008b7290, 0x2b}, {0xc0008b72c0, 0x2f}, {0x0, 0x0}, ...}, ...)
github.com/sylabs/singularity/v4/e2e/internal/e2e/singularitycmd.go:686 +0x45d
github.com/sylabs/singularity/v4/e2e/inspect.ctx.singularityInspect({{{0xc00043b100, 0x1a}, {0xc000a40540, 0x1e}, {0xc0008b7290, 0x2b}, {0xc0008b72c0, 0x2f}, {0x0, 0x0}, ...}}, ...)
github.com/sylabs/singularity/v4/e2e/inspect/inspect.go:353 +0x2a50
github.com/sylabs/singularity/v4/e2e/internal/testhelper.(*Suite).Run.func1.1.1(0xc00080e000)
github.com/sylabs/singularity/v4/e2e/internal/testhelper/testhelper.go:91 +0x3f
testing.tRunner(0xc00080e000, 0xc00005cc10)
testing/testing.go:1934 +0x21d
created by testing.(*T).Run in goroutine 339
testing/testing.go:1997 +0x9d3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the Pull Request (PR):
Handles the SIGTERM signal to the starter binary such that containers have a chance to gracefully shut down, especially when run through a system service. Should fix issue #947, ableit a slightly different approach than what was described in the issue. This also allows us to properly close and stop mounts before we get SIGKILLed by the service if relevant.
This fixes or addresses the following GitHub issues:
Before submitting a PR, make sure you have done the following:
make checkand tested this PR locally with amake test, andmake testallif possible (see CONTRIBUTING.md).Done all of the above except writing tests, may need help with this as this is my first time contributing Go. This PR should also be squashed before merging.