copy command: bug fix and enhance #2890

fuweid · 2019-06-04T03:31:46Z

Ⅰ. Describe what this PR did

add rollback for copy command
add debug log
support to mount /dev/, /proc folder

Ⅱ. Does this pull request fix one issue?

none

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

has cases

Ⅳ. Describe how to verify it

wait for CI

Ⅴ. Special notes for reviews

Signed-off-by: Wei Fu <fuweid89@gmail.com>

The /dev/ /tmp /proc are default mount point from oci spec. They are not in the container mount points. When we pass the /dev/terminal-log as dest, it will mount after the /dev, which handed by runC in the special namespace. But when we try to mount for copy, we don't have /dev folder or sub folder, we need to create parent folder for the target or empty file. Signed-off-by: Wei Fu <fuweid89@gmail.com>

codecov · 2019-06-04T03:31:49Z

Codecov Report

Merging #2890 into master will decrease coverage by 0.1%.
The diff coverage is 35.55%.

@@            Coverage Diff            @@
##           master   #2890      +/-   ##
=========================================
- Coverage   68.91%   68.8%   -0.11%     
=========================================
  Files         291     291              
  Lines       18230   18249      +19     
=========================================
- Hits        12563   12557       -6     
- Misses       4215    4236      +21     
- Partials     1452    1456       +4

Flag	Coverage Δ
#criv1alpha2_test	`38.33% <0%> (-0.07%)`	⬇️
#integration_test_0	`36.1% <0%> (-0.05%)`	⬇️
#integration_test_1	`35.69% <35.55%> (-0.01%)`	⬇️
#integration_test_2	`36.03% <0%> (+0.01%)`	⬆️
#integration_test_3	`35.68% <24.44%> (ø)`	⬆️
#node_e2e_test	`34.11% <0%> (-0.12%)`	⬇️
#unittest	`28.03% <0%> (-0.04%)`	⬇️

Impacted Files	Coverage Δ
daemon/mgr/container_copy.go	`58.08% <35.13%> (-1.92%)`	⬇️
daemon/mgr/container_storage.go	`60.03% <37.5%> (-0.43%)`	⬇️
pkg/streams/utils.go	`82.14% <0%> (-7.15%)`	⬇️
cri/ocicni/netns.go	`58.1% <0%> (-2.71%)`	⬇️
cri/ocicni/cni_manager.go	`59.25% <0%> (-1.86%)`	⬇️
ctrd/supervisord/daemon.go	`49.32% <0%> (-1.36%)`	⬇️
daemon/mgr/container.go	`59.72% <0%> (-0.63%)`	⬇️
cri/v1alpha2/cri.go	`69.06% <0%> (-0.26%)`	⬇️
ctrd/container.go	`54.3% <0%> (+0.38%)`	⬆️
apis/server/utils.go	`75% <0%> (+3.84%)`	⬆️
... and 1 more

ZYecho

LGTM

fuweid added 2 commits June 4, 2019 11:28

copy command: add rollback action and update cases

7a9604f

Signed-off-by: Wei Fu <fuweid89@gmail.com>

fuweid requested a review from ZYecho June 4, 2019 03:31

pouchrobot added areas/cli kind/bug This is bug report for project size/L labels Jun 4, 2019

ZYecho reviewed Jun 4, 2019

View reviewed changes

ZYecho merged commit 86433c9 into AliyunContainerService:master Jun 4, 2019

fuweid deleted the me-enhance-cp branch June 4, 2019 05:57

pouchrobot mentioned this pull request Jun 7, 2019

WeeklyReport of PouchContainer from 2019-05-31 to 2019-06-07 #2896

Closed

weekly-digest bot mentioned this pull request Jun 9, 2019

Weekly Digest (2 June, 2019 - 9 June, 2019) #2898

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

copy command: bug fix and enhance #2890

copy command: bug fix and enhance #2890

fuweid commented Jun 4, 2019

codecov bot commented Jun 4, 2019 •

edited

ZYecho left a comment

copy command: bug fix and enhance #2890

copy command: bug fix and enhance #2890

Conversation

fuweid commented Jun 4, 2019

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov bot commented Jun 4, 2019 • edited

Codecov Report

ZYecho left a comment

Choose a reason for hiding this comment

codecov bot commented Jun 4, 2019 •

edited