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.

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

fix(): support re-enabling oom killer refs #307 #311

Merged
merged 1 commit into from
Dec 29, 2023
Merged

fix(): support re-enabling oom killer refs #307 #311

merged 1 commit into from
Dec 29, 2023

Conversation

kestrelcjx
Copy link

@kestrelcjx kestrelcjx commented Nov 28, 2023

DisableOOMKiller will be ignored if it is false, which will result in oomkiller being unable to be re-enabled after this setting is disabled.

Signed-off-by: kestrel <kestrelcjx@gmail.com>
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 1e05688 into containerd:main Dec 29, 2023
8 checks passed
@@ -454,6 +454,9 @@ func getOomControlValue(mem *specs.LinuxMemory) *int64 {
if mem.DisableOOMKiller != nil && *mem.DisableOOMKiller {
i := int64(1)
return &i
} else if mem.DisableOOMKiller != nil && !*mem.DisableOOMKiller {
Copy link
Member

Choose a reason for hiding this comment

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

No need to repeat if mem.DisableOOMKiller != nil twice

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants