-
Notifications
You must be signed in to change notification settings - Fork 948
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
feature: add run flag ulimit #1179
feature: add run flag ulimit #1179
Conversation
Codecov Report
@@ Coverage Diff @@
## master #1179 +/- ##
=========================================
- Coverage 15.7% 15.6% -0.11%
=========================================
Files 171 172 +1
Lines 10398 10433 +35
=========================================
- Hits 1633 1628 -5
- Misses 8645 8685 +40
Partials 120 120
|
@@ -978,3 +978,24 @@ func (suite *PouchRunSuite) TestRunWithVolumesFrom(c *check.C) { | |||
|
|||
c.Assert(volumeFound, check.Equals, true) | |||
} | |||
|
|||
// TestRunWithUlimit tests running container with --ulimit flag. | |||
func (suite *PouchRunSuite) TestRunWithUlimit(c *check.C) { |
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.
This is a test which is to to test if the value is in the container meta data. Is there a way to check whether this configuration takes effect in the running container?
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.
@allencloud , I think you are not take a careful look at test , it test the ulimit set output,.
out := res.Stdout()
c.Assert(out, check.Equals, "256\n")
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.
Aha, my fault.
cli/ulimit.go
Outdated
} | ||
|
||
// value return ulimit values as type ResourcesUlimitsItems0 | ||
func (u *Ulimit) value() []*types.ResourcesUlimitsItems0 { |
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.
I think ResourcesUlimitsItems0
is not in the correct way of api types. @fuweid This is in API side. Please help to take a look.
In addition, if this file is reasonable to locate here. How about package opts? @HusterWan
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.
ResourcesUlimitsItems0
is generated before, I also do not like it.
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.
@allencloud I have synced with @Ace-Tang offline. we can define ulimit
out of the resource
so that we can avoid the default composed name.
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.
daemon/mgr/spec.go
Outdated
@@ -30,6 +30,7 @@ var setupFunc = []SetupFunc{ | |||
setupCap, | |||
setupNoNewPrivileges, | |||
setupOOMScoreAdj, | |||
setupUlimits, |
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.
I wish that we could merge #1154 first. This refactoring is quite important I think. I suggest promoting that pr's priority.
Otherwise conflict is there.
support ulimit in run and exec process Signed-off-by: Ace-Tang <aceapril@126.com>
LGTM |
Signed-off-by: Ace-Tang aceapril@126.com
Ⅰ. Describe what this PR did
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews