Keep directories when SIGINT sent to daemon #1526
Open
Conversation
This file contains 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
Signed-off-by: David Son <davbson@amazon.com>
1 task
pendo324
added a commit
to runfinch/finch
that referenced
this pull request
Jan 29, 2024
…#767) Issue #, if available: re-verified #412 - Through extensive e2e test debugging, I noticed that soci and stargz snapshotters weren't persisting data as expected. After debugging, I found some context in these two PRs: - awslabs/soci-snapshotter#881 - containerd/stargz-snapshotter#1526 Unfortunately, neither of them are deployed yet, so I've implemented a hacky workaround for now. After this change, an image/container can be pull/run, the VM can be restarted, and then the container can be re-started again. *Description of changes:* - Redo how BuildKit/Stargz/SOCI are related to containerd using [systemd's `PartOf` ](https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html#PartOf=) - this ensures that all of these services are restarted when containerd is restarted, which the lack of has caused errors in the past - Create some missing directories that might throw errors in cloud-init - Ensure that `SIGTERM` is used to kill the snapshotter services for now *Testing done:* - manual testing - [x] I've reviewed the guidance in CONTRIBUTING.md #### License Acceptance By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Signed-off-by: Justin Alvarez <alvajus@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #1440
This change was done due to the general recommendation to use SIGTERM instead of SIGINT. This change will make SIGINT effectively behave the same as SIGTERM, but will properly unmount the FUSE mounts instead of leaving them hanging. This means that we can now kill the daemon with SIGINT and start it up again without any issues or workarounds.. However, this may not be desired behavior, so feel free to close the PR if this is undesirable.
This is identical to #881 in awslabs/soci-snapshotter.
I tested this with the following workflow:
I then checked a.log and confirmed that there were logs showing the image was being pulled with stargz. I also checked
mount | grep fuseand saw the FUSE mounts present.I checked the logs again to see it was killed, and checked that
mount | grep fusehad no FUSE mounts present.I then checked a.log and confirmed that all snapshots were remounted, and that
mount | grep fusewas repopulated.