Support systemd socket activation #1378
Open
+49
−2
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
Kern--
force-pushed
the
socket-activation
branch
from
0a33761
to
9db5fdf
Compare
This change adds 2 features: 1) the --address flag of the soci snapshotter supports a network prefix 2) The soci snapshotter can listen on a file descriptor passed by systemd socket activation. If the user tells soci to listen on a file descriptor, but doesn't use systemd socket activation to launch the process, the snapshotter will fall back to the default address as a unix socket. The example systemd service file is updated to use systemd activation if possible. There is an example systemd socket file, but no strict dependency from the service file so that users who are always starting SOCI on boot won't get a warning from systemd. Signed-off-by: Kern Walster <walster@amazon.com>
Kern--
force-pushed
the
socket-activation
branch
from
9db5fdf
to
fbd8126
Compare
sondavidb
reviewed
Sep 18, 2024
There was a problem hiding this comment.
Do we want to add an integration test to this? My understanding is that this doesn't change anything in the integration tests so maybe a quick one using socket activation. (Though actually, alpine doesn't support systemd, so maybe not something very feasible?)
| return nil, err | ||
| } | ||
| if len(listeners) == 0 { | ||
| log.G(ctx).Info("Address was set to listen on a file descriptor, but no file descriptors were passed. Perhaps soci was launched directly without using systemd socket activation? Using the default address.") |
There was a problem hiding this comment.
nit: Can we separate the last sentence into a separate log message for clarity?
austinvazquez
approved these changes
Sep 26, 2024
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.
Issue #, if available:
Closes #1088
Description of changes:
This change adds 2 features:
systemd socket activation.
If the user tells soci to listen on a file descriptor, but doesn't use systemd socket activation to launch the process, the snapshotter will fall back to the default address as a unix socket.
The example systemd service file is updated to use systemd activation if possible. There is an example systemd socket file, but no strict dependency from the service file so that users who are always starting SOCI on boot won't get a warning from systemd.
Testing performed:
Tested manually and verified that:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.