refactor: refact the setup spec mount #2653
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
Codecov Report
@@ Coverage Diff @@
## master #2653 +/- ##
=========================================
+ Coverage 69.38% 69.6% +0.22%
=========================================
Files 280 280
Lines 18845 18857 +12
=========================================
+ Hits 13075 13125 +50
+ Misses 4293 4266 -27
+ Partials 1477 1466 -11
|
Ace-Tang
reviewed
Jan 7, 2019
daemon/mgr/spec_mount.go
Outdated
| @@ -42,7 +42,12 @@ func clearReadonly(m *specs.Mount) { | |||
|
|
|||
| // setupMounts create mount spec. | |||
| func setupMounts(ctx context.Context, c *Container, s *specs.Spec) error { | |||
| if c.HostConfig == nil { | |||
| return nil | |||
daemon/mgr/spec_mount.go
Outdated
| @@ -121,10 +116,19 @@ func setupMounts(ctx context.Context, c *Container, s *specs.Spec) error { | |||
| mounts = append(mounts, generateNetworkMounts(c)...) | |||
| } | |||
|
|
|||
| s.Mounts = sortMounts(mounts) | |||
| // modify share memory size, and change rw mode for privileged mode. | |||
| for i := range s.Mounts { | |||
There was a problem hiding this comment.
s/s.Mounts/mounts/, use combined mount
rudyfly
force-pushed
the
refect_mount_spec
branch
from
c09ff0b to
58b7248
Compare
allencloud
changed the title
rudyfly
force-pushed
the
refect_mount_spec
branch
from
58b7248 to
0495722
Compare
rudyfly
force-pushed
the
refect_mount_spec
branch
from
0495722 to
71c32e8
Compare
refact the setup spec mount, make it a logical structure as below: 1. override the default spec mounts by container's config; 2. setup container's mounts into spec mounts; 3. setup or modify extra configs into spec mounts; 4. sort all spec mounts. Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
rudyfly
force-pushed
the
refect_mount_spec
branch
from
71c32e8 to
9f904bd
Compare
HusterWan
reviewed
Jan 8, 2019
| // setupMounts create mount spec. | ||
| func setupMounts(ctx context.Context, c *Container, s *specs.Spec) error { | ||
| var ( | ||
| mounts []specs.Mount |
There was a problem hiding this comment.
no need to define this parameter, WDYT?
HusterWan
reviewed
Jan 8, 2019
| func setupMounts(ctx context.Context, c *Container, s *specs.Spec) error { | ||
| var mounts []specs.Mount | ||
| // Override the default mounts which are duplicate with user defined ones. | ||
| func overrideDefaultMount(mounts []specs.Mount, c *Container, s *specs.Spec) ([]specs.Mount, error) { |
There was a problem hiding this comment.
Maybe we can add some test cases for the new function.
There was a problem hiding this comment.
It isn't complicated logic, I think it no need to add unit test.
There was a problem hiding this comment.
Should add, but can be in another pr
|
LGTM |
pouchrobot
added
the
LGTM
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.
Ⅰ. Describe what this PR did
refect the setup spec mount, make it a logical structure as below:
Ⅱ. Does this pull request fix one issue?
NONE
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
NO
Ⅳ. Describe how to verify it
NA
Ⅴ. Special notes for reviews
Signed-off-by: Rudy Zhang rudyflyzhang@gmail.com