default to higher oom scores for user sessions #20893
Merged
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
|
/cc @benzea |
bluca
approved these changes
Sep 30, 2021
|
would it be possible to add some checks to https://github.com/systemd/systemd/blob/main/test/units/testsuite-55.sh to cover this? |
|
The change and feature looks fine to me. I agree that +100 seems conservative enough for kernel OOM killing and likely will not be noticeably harmful. |
keszybz
added
reviewed/needs-rework 🔨
|
Some minor issues are outstanding, but let's merge once that's fixed. |
…e service manager's by default Let's make our service managers slightly less likely to be killed by the OOM killer by adjusting our services' OOM score adjustment to 100 above ours. Do this conservatively, i.e. only for regular user sessions.
Let's make it slightly more likely that a per-user service manager is killed than any system service. We use a conservative 100 (from a range that goes all the way to 1000). Replaces: systemd#17426 Together with the previous commit this means: system manager and system services are placed at OOM score adjustment 0 (specifically: they inherit kernel default of 0). User service manager (both for root and non-root) are placed at 100. User services for non-root are placed at 200, those for root inherit 100. Note that processes forked off the user *sessions* (i.e. not forked off the per-user service manager) remain at 0 (e.g. the shell process created by a tty or ssh login). This probably should be addressed too one day (maybe in pam_systemd?), but is not covered here.
poettering
force-pushed
the
per-user-oom-score
branch
from
b03de7f
to
643006f
Compare
|
made the three changes. nothing else. upgrading green label. |
poettering
added
good-to-merge/waiting-for-ci 👍
|
test-repart timed out but that doesn't seem related to this PR |
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.
An attempt to revive/finish #17426