-
Notifications
You must be signed in to change notification settings - Fork 2.1k
feat(deployment): add sd_notify integration with watchdog support #25072
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
Open
newtonne
wants to merge
4
commits into
vectordotdev:master
Choose a base branch
from
newtonne:systemd-notify
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Add systemd notify integration. Vector now sends `READY=1` when fully started, `STOPPING=1` | ||
| when beginning a graceful shutdown, and `WATCHDOG=1` pings at half the configured `WatchdogSec` | ||
| interval. The bundled `vector.service` and `hardened-vector.service` unit files are updated | ||
| to use `Type=notify`, with an optional `WatchdogSec` directive. | ||
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| //! Systemd integration via `sd_notify` | ||
| //! See <https://www.freedesktop.org/software/systemd/man/latest/sd_notify.html> | ||
|
|
||
| use tokio::time::interval; | ||
|
|
||
| /// Sends `READY=1` to systemd via sd_notify. No-op if not Type=notify. | ||
| pub fn sd_notify_ready() { | ||
| if let Err(error) = sd_notify::notify(&[sd_notify::NotifyState::Ready]) { | ||
| warn!(message = "Failed to notify systemd of ready state.", %error); | ||
| } | ||
| } | ||
|
|
||
| /// Sends `STOPPING=1` to systemd via sd_notify. No-op if not Type=notify. | ||
| pub fn sd_notify_stopping() { | ||
| if let Err(error) = sd_notify::notify(&[sd_notify::NotifyState::Stopping]) { | ||
| warn!(message = "Failed to notify systemd of stopping state.", %error); | ||
| } | ||
| } | ||
|
|
||
| /// Sends `WATCHDOG=1` to systemd via sd_notify. No-op if not Type=notify. | ||
| pub fn sd_notify_watchdog() { | ||
| if let Err(error) = sd_notify::notify(&[sd_notify::NotifyState::Watchdog]) { | ||
| warn!(message = "Failed to send systemd watchdog ping.", %error); | ||
| } | ||
| } | ||
|
|
||
| /// Sends `WATCHDOG=1` pings at half the `WatchdogSec` interval. No-op if not set. | ||
| pub async fn watchdog() { | ||
| let Some(duration) = sd_notify::watchdog_enabled() else { | ||
| return; | ||
| }; | ||
| let mut ticker = interval(duration / 2); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also might be worth adding here: debug!(
message = "Systemd watchdog keepalive started.",
interval_secs = ticker.as_secs_f64(),
); |
||
| loop { | ||
| ticker.tick().await; | ||
| sd_notify_watchdog(); | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| #[test] | ||
| fn sd_notify_no_socket_does_not_panic() { | ||
| // NOTIFY_SOCKET is not set in test environments - these must be no-ops. | ||
| super::sd_notify_ready(); | ||
| super::sd_notify_stopping(); | ||
| super::sd_notify_watchdog(); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to add an
authors:here like the other files