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

test: increate the memory limit to TestRunWithMemoryswap2x #2710

Merged
merged 1 commit into from
Feb 14, 2019
Merged

test: increate the memory limit to TestRunWithMemoryswap2x #2710

merged 1 commit into from
Feb 14, 2019

Conversation

fuweid
Copy link
Contributor

@fuweid fuweid commented Feb 14, 2019

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

Ⅰ. Describe what this PR did

For the CVE-2019-5736, the runC will copy the binary during initializing
process in container. The binary is about 11M so that it will make the
case fail. Based on this, we should increate to 20m.

Ⅱ. 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

CI

Ⅴ. Special notes for reviews

For the CVE-2019-5736, the runC will copy the binary during initializing
process in container. The binary is about 11M so that it will make the
case fail. Based on this, we should increate to 20m.

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

codecov bot commented Feb 14, 2019

Codecov Report

Merging #2710 into master will decrease coverage by 0.06%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2710      +/-   ##
==========================================
- Coverage   69.35%   69.29%   -0.07%     
==========================================
  Files         278      278              
  Lines       17462    17462              
==========================================
- Hits        12111    12100      -11     
- Misses       4023     4035      +12     
+ Partials     1328     1327       -1
Flag Coverage Δ
#criv1alpha2_test 39.55% <ø> (-0.07%) ⬇️
#integration_test_0 36.32% <ø> (-0.05%) ⬇️
#integration_test_1 35.26% <ø> (ø) ⬆️
#integration_test_2 36.27% <ø> (ø) ⬆️
#integration_test_3 35.13% <ø> (-0.04%) ⬇️
#node_e2e_test 35.06% <ø> (+0.02%) ⬆️
#unittest 27.39% <ø> (ø) ⬆️
Impacted Files Coverage Δ
pkg/streams/utils.go 82.14% <0%> (-9.53%) ⬇️
daemon/mgr/events.go 89.04% <0%> (-2.74%) ⬇️
ctrd/client.go 64.04% <0%> (-1.69%) ⬇️
daemon/mgr/container.go 59.5% <0%> (-0.42%) ⬇️
ctrd/container.go 57.27% <0%> (-0.39%) ⬇️
cri/v1alpha2/cri.go 71.92% <0%> (ø) ⬆️
daemon/mgr/container_utils.go 85.11% <0%> (+1.19%) ⬆️
pkg/meta/store.go 68.99% <0%> (+1.55%) ⬆️
daemon/containerio/io.go 76.69% <0%> (+1.94%) ⬆️
daemon/logger/crilog/log.go 82.6% <0%> (+2.89%) ⬆️

@fuweid fuweid requested review from chuanchang and Ace-Tang and removed request for chuanchang February 14, 2019 02:26
@Ace-Tang Ace-Tang merged commit 69e6356 into AliyunContainerService:master Feb 14, 2019
@fuweid fuweid deleted the increate-memory-for-cve-runc-change branch February 14, 2019 03:01
@Ace-Tang
Copy link
Contributor

Refer to opencontainers/runc#1980

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants