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

copy: should not mount rootfs again #2899

Merged
merged 1 commit into from
Jun 10, 2019
Merged

copy: should not mount rootfs again #2899

merged 1 commit into from
Jun 10, 2019

Conversation

fuweid
Copy link
Contributor

@fuweid fuweid commented Jun 10, 2019

Ⅰ. Describe what this PR did

for the copy command, we need to copy thing into container. But we can't
mount/umount the rootfs again, because it will impact /home and /tmp in
running container. Align with moby behaviour, we use the host rootfs
directly for running container without mount/unmount.

Ⅱ. Does this pull request fix one issue?

none

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

no need

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

for the copy command, we need to copy thing into container. But we can't
mount/umount the rootfs again, because it will impact /home and /tmp in
running container. Align with moby behaviour, we use the host rootfs
directly for running container without mount/unmount.

Signed-off-by: Wei Fu <[email protected]>
@fuweid fuweid requested a review from ZYecho June 10, 2019 02:18
@codecov
Copy link

codecov bot commented Jun 10, 2019

Codecov Report

Merging #2899 into master will decrease coverage by 16.16%.
The diff coverage is 16.32%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #2899       +/-   ##
===========================================
- Coverage    68.9%   52.74%   -16.17%     
===========================================
  Files         291      291               
  Lines       18251    18238       -13     
===========================================
- Hits        12576     9619     -2957     
- Misses       4222     7395     +3173     
+ Partials     1453     1224      -229
Flag Coverage Δ
#criv1alpha2_test 38.33% <16.32%> (-0.07%) ⬇️
#integration_test_0 ?
#integration_test_1 ?
#integration_test_2 ?
#integration_test_3 ?
#node_e2e_test ?
#unittest 28.05% <0%> (+0.02%) ⬆️
Impacted Files Coverage Δ
daemon/mgr/container_copy.go 0% <0%> (-58.09%) ⬇️
daemon/mgr/container_storage.go 41.96% <50%> (-18.08%) ⬇️
pkg/ioutils/reader.go 0% <0%> (-100%) ⬇️
daemon/logger/logmessage.go 0% <0%> (-100%) ⬇️
hookplugins/containerplugin/update_hook.go 0% <0%> (-100%) ⬇️
daemon/mgr/spec_apparmor_linux_unsupported.go 0% <0%> (-100%) ⬇️
pkg/httputils/http_error.go 0% <0%> (-100%) ⬇️
apis/server/container_bridge.go 0% <0%> (-90%) ⬇️
apis/server/volume_bridge.go 0% <0%> (-87.18%) ⬇️
cri/stream/remotecommand/websocket.go 0% <0%> (-81.54%) ⬇️
... and 99 more

Copy link
Contributor

@ZYecho ZYecho left a comment

Choose a reason for hiding this comment

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

LGTM

@ZYecho ZYecho merged commit cdcf3ea into AliyunContainerService:master Jun 10, 2019
@fuweid fuweid deleted the me-fix-cp-bug branch January 2, 2020 03:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants