This repository has been archived by the owner on Aug 29, 2018. It is now read-only.
Bug 1171289 - background pkill command in OOMPlugin #6010
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
a13m
force-pushed
the
bz1171289-master
branch
from
f490950
to
3f92ecc
Compare
|
[merge] |
|
Online Merge Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/merge_pull_requests/6278/) (Image: devenv_5401) |
|
[Test]ing while waiting on the merge queue |
|
Origin Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests/3269/) |
|
Online Test Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/test_pull_requests/8625/) |
|
@a13m Looks like test_oom_control needs a corresponding change |
|
Evaluated for origin up to f3a343f |
|
[merge] |
|
Evaluated for online up to f3a343f |
openshift-bot
pushed a commit
that referenced
this pull request
Jan 20, 2015
Merged by openshift-bot
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 are two significant fixes here:
Instead of using ApplicationContainer.kill_procs, which waits for pkill/pgrep process to return, we simply spawn a pkill and detach it, because we don't actually care about its return code, and we cannot wait for it.
The while loop runs when oom_control['under_oom'] is 1, even if the memory usage indicates that the cgroup has fallen below its memsw limit.