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

RFC manager: Add deferred parsing of mountinfo #29821

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

RFC manager: Add deferred parsing of mountinfo #29821

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12e8a2a
manager: Add late parsing of mountinfo
Werkov Oct 31, 2023
43044d2
core/mount: Make mount rate limiting interval configurable
Werkov Jan 26, 2024
c3d270a
sd-event: Add explicit API for entering ratelimit state
Werkov Jan 26, 2024
2e5dd64
manager: Protect late mountinfo parsing (in user instance) from concu…
Werkov Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/core/mount.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2063,7 +2063,9 @@ static void mount_enumerate(Manager *m) {
mnt_init_debug(0);
Copy link
Member

Choose a reason for hiding this comment

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

this 2nd commit should really be a separate PR. it should be fine to merge independently.


if (!m->mount_monitor) {
usec_t mount_rate_limit_interval = 1 * USEC_PER_SEC;
unsigned mount_rate_limit_burst = 5;
const char *e;
int fd;

m->mount_monitor = mnt_new_monitor();
Expand Down Expand Up @@ -2104,14 +2106,22 @@ static void mount_enumerate(Manager *m) {
}

/* Let users override the default (5 in 1s), as it stalls the boot sequence on busy systems. */
const char *e = secure_getenv("SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_BURST");
e = secure_getenv("SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_BURST");
if (e) {
r = safe_atou(e, &mount_rate_limit_burst);
if (r < 0)
log_debug("Invalid value in $SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_BURST, ignoring: %s", e);
}

r = sd_event_source_set_ratelimit(m->mount_event_source, 1 * USEC_PER_SEC, mount_rate_limit_burst);
e = secure_getenv("SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_INTERVAL");
if (e) {
r = parse_sec(e, &mount_rate_limit_interval);
if (r < 0)
log_debug("Invalid value in $SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_INTERVAL, ignoring: %s", e);
}


Copy link
Member

Choose a reason for hiding this comment

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

spurious double empty line

r = sd_event_source_set_ratelimit(m->mount_event_source, mount_rate_limit_interval, mount_rate_limit_burst);
if (r < 0) {
log_error_errno(r, "Failed to enable rate limit for mount events: %m");
goto fail;
Expand Down