-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Use update time to detect if kmem limits have been set #935
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
Signed-off-by: Vishnu kannan <[email protected]>
Signed-off-by: Vishnu kannan <[email protected]>
cc @mrunalp |
_, err = d.join("memory") | ||
if err != nil && !cgroups.IsNotFound(err) { | ||
if _, jerr := d.join("memory"); jerr != nil && !cgroups.IsNotFound(jerr) { | ||
err = jerr | ||
return err |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could just return jerr
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
err
needs to be set for the defer function to execute.
Looks fine except for one nit. |
1 similar comment
hqhq
added a commit
to hqhq/runc
that referenced
this pull request
Jul 21, 2016
Revert: opencontainers#935 Fixes: opencontainers#946 I can reproduce opencontainers#946 on some machines, the problem is on some machines, it could be very fast that modify time of `memory.kmem.limit_in_bytes` could be the same as before it's modified. And now we'll call `SetKernelMemory` twice on container creation which cause the second time failure. Revert this before we find a better solution. Signed-off-by: Qiang Huang <[email protected]>
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.
This PR should also fix #841
xref: kubernetes/kubernetes#27204
#841 needs to be fixed to make it possible to update libcontainer version in kubernetes.
cc @cyphar @crosbymichael @dubstack