bugfix: only list container stats which are created by cri #2273
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 #2273 +/- ##
==========================================
+ Coverage 66.82% 66.82% +<.01%
==========================================
Files 208 209 +1
Lines 16937 16963 +26
==========================================
+ Hits 11318 11336 +18
- Misses 4262 4268 +6
- Partials 1357 1359 +2
|
fuweid
reviewed
Sep 25, 2018
cri/v1alpha1/cri.go
Outdated
| @@ -822,7 +822,7 @@ func (c *CriManager) ContainerStats(ctx context.Context, r *runtime.ContainerSta | |||
| func (c *CriManager) ListContainerStats(ctx context.Context, r *runtime.ListContainerStatsRequest) (*runtime.ListContainerStatsResponse, error) { | |||
| opts := &mgr.ContainerListOption{All: true} | |||
| filter := func(c *mgr.Container) bool { | |||
| return true | |||
| return c.Config.Labels[containerTypeLabelKey] == containerTypeLabelContainer | |||
YaoZengzeng
force-pushed
the
filter-stats
branch
from
aac0a06 to
e394e13
Compare
YaoZengzeng
force-pushed
the
filter-stats
branch
6 times, most recently
from
805664c to
3372df1
Compare
starnop
reviewed
Sep 25, 2018
| @@ -822,6 +822,19 @@ func (c *CriManager) ContainerStats(ctx context.Context, r *runtime.ContainerSta | |||
| func (c *CriManager) ListContainerStats(ctx context.Context, r *runtime.ListContainerStatsRequest) (*runtime.ListContainerStatsResponse, error) { | |||
| opts := &mgr.ContainerListOption{All: true} | |||
| filter := func(c *mgr.Container) bool { | |||
| if c.Config.Labels[containerTypeLabelKey] != containerTypeLabelContainer { | |||
| return false | |||
| } | |||
There was a problem hiding this comment.
Maybe add a blank here to distinguish between filtering created by CRI Manager and filtering by request and it's beeter to write comments. WDTY?
starnop
reviewed
Sep 25, 2018
cri/v1alpha2/cri_utils.go
Outdated
| @@ -814,6 +814,20 @@ func filterCRIContainers(containers []*runtime.Container, filter *runtime.Contai | |||
| return filtered | |||
| } | |||
|
|
|||
| // matchLabelSelector returns true if labels cover selector. | |||
| func matchLabelSelector(selector, labels map[string]string) bool { | |||
There was a problem hiding this comment.
This function is uncoupled with runtime, maybe create a directory like utils under the cri directory for more public utility methods and move this funtion over. WDYT?
There was a problem hiding this comment.
Yes, we could do it in another PR and move all the public utility methods to there.
There was a problem hiding this comment.
@YaoZengzeng please put it in this PR. 😄 can you do this?
YaoZengzeng
force-pushed
the
filter-stats
branch
4 times, most recently
from
0baaf7b to
d1262fc
Compare
YaoZengzeng
force-pushed
the
filter-stats
branch
2 times, most recently
from
76dbb51 to
b85861a
Compare
Signed-off-by: YaoZengzeng <[email protected]>
YaoZengzeng
force-pushed
the
filter-stats
branch
from
b85861a to
ee3640c
Compare
fuweid
reviewed
Sep 27, 2018
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.
Signed-off-by: YaoZengzeng [email protected]
Ⅰ. Describe what this PR did
When CRI manager list container stats, filter the container which is not created by CRI.
Ⅱ. Does this pull request fix one issue?
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
No
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews