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

fix: Prevent the constant logging of cgroup errors on non-linux machines #2264

Merged
merged 5 commits into from
Dec 12, 2024
Merged

fix: Prevent the constant logging of cgroup errors on non-linux machines #2264

merged 5 commits into from
Dec 12, 2024

Conversation

dehaansa
Copy link
Contributor

PR Description

  1. Update automemlimit to fix the log format of an error log fix(memlimit): don't use format string with slog KimMachineGun/automemlimit#19
  2. Update use of automemlimit to not try to use cgroup based logic when not running on Linux. Still allow use of the system experiment in automemlimit if the environment variable is set up to use it.

Which issue(s) this PR fixes

Fixes #2223
Relevant to #2225

Notes to the Reviewer

PR Checklist

  • CHANGELOG.md updated

@dehaansa dehaansa requested a review from a team as a code owner December 11, 2024 20:29
@dehaansa dehaansa changed the title Prevent the constant logging of cgroup errors on non-linux machines fix: Prevent the constant logging of cgroup errors on non-linux machines Dec 11, 2024
ptodev
ptodev reviewed Dec 12, 2024
View reviewed changes
Copy link
Contributor

@ptodev ptodev left a comment

Choose a reason for hiding this comment

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

Thank you! I was also thinking yesterday that having an error isn't a good UX :)

internal/alloycli/automemlimit_cgroups_unsupported.go Show resolved Hide resolved
internal/alloycli/automemlimit_linux.go Show resolved Hide resolved
internal/alloycli/automemlimit_cgroups_unsupported.go Show resolved Hide resolved
internal/alloycli/automemlimit_cgroups_unsupported.go Show resolved Hide resolved
@ptodev ptodev self-assigned this Dec 12, 2024
mattdurham
mattdurham approved these changes Dec 12, 2024
View reviewed changes
Copy link
Collaborator

@mattdurham mattdurham left a comment

Choose a reason for hiding this comment

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

Looks reasonable, only nit would be to document the var if we are referencing it.

@dehaansa dehaansa requested a review from ptodev December 12, 2024 16:59
@dehaansa dehaansa merged commit c9d0c11 into grafana:main Dec 12, 2024
15 checks passed
@dehaansa dehaansa deleted the chore/update-automemlimit branch December 12, 2024 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattdurham mattdurham mattdurham approved these changes

@clayton-cornell clayton-cornell Awaiting requested review from clayton-cornell clayton-cornell is a code owner

@ptodev ptodev Awaiting requested review from ptodev

Assignees

@ptodev ptodev

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Log bug? memory is not limited, skipping: %v
3 participants
@dehaansa @mattdurham @ptodev