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

daemon/mgr/image: update deadline for loading images #2736

Merged
merged 1 commit into from
Mar 8, 2019
Merged

daemon/mgr/image: update deadline for loading images #2736

merged 1 commit into from
Mar 8, 2019

Conversation

fuweid
Copy link
Contributor

@fuweid fuweid commented Mar 7, 2019

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

Ⅰ. Describe what this PR did

PouchContainer will load all the images from containerd into memory. At
the beginning, we assume that it can load it in 10 secs. But if the
system has busy IO, it will take long time to load it, especially the
more-layers and huge-size images. So update it from 10 secs to 10 mins.

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

@codecov
Copy link

codecov bot commented Mar 7, 2019

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2736      +/-   ##
==========================================
+ Coverage   69.31%   69.37%   +0.06%     
==========================================
  Files         278      278              
  Lines       17442    17442              
==========================================
+ Hits        12090    12101      +11     
+ Misses       4025     4018       -7     
+ Partials     1327     1323       -4
Flag Coverage Δ
#criv1alpha2_test 39.47% <ø> (+0.06%) ⬆️
#integration_test_0 36.6% <ø> (-0.03%) ⬇️
#integration_test_1 35.37% <ø> (-0.13%) ⬇️
#integration_test_2 36.56% <ø> (+0.02%) ⬆️
#integration_test_3 35.42% <ø> (ø) ⬆️
#node_e2e_test 35.36% <ø> (+0.08%) ⬆️
#unittest 28.44% <ø> (ø) ⬆️
Impacted Files Coverage Δ
daemon/mgr/image.go 59.45% <ø> (ø) ⬆️
cri/v1alpha2/cri.go 72.1% <0%> (+0.64%) ⬆️
cri/ocicni/cni_manager.go 70.58% <0%> (+11.76%) ⬆️

@fuweid fuweid requested a review from Ace-Tang March 7, 2019 12:17
Copy link
Contributor

@Ace-Tang Ace-Tang left a comment

Choose a reason for hiding this comment

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

LGTM

@Ace-Tang
Copy link
Contributor

Ace-Tang commented Mar 7, 2019

Wait for ci pass

@@ -30,7 +30,9 @@ import (
"github.com/sirupsen/logrus"
)

var deadlineLoadImagesAtBootup = time.Second * 10
// NOTE: make it to 10 minutes because it will take long time to load the
Copy link
Contributor

Choose a reason for hiding this comment

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

Actually this is not overtime because of image, but the machine env, like load, or other thing, would you mind to change the comment? @fuweid

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah. it is one of reason. the biggest issue is high load in machine.

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually not vary accurately, also ok

PouchContainer will load all the images from containerd into memory. At
the beginning, we assume that it can load it in 10 secs. But if the
system has busy IO, it will take long time to load it, especially the
more-layers and huge-size images. So update it from 10 secs to 10 mins.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
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