Run extra CRI queries even when parse_containerd succeeds #32
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
We can get two things from containerd-specific data that save us more effort later: - resource limits - IP address Unfortunately, cri-o now passes the parse_containerd checks as well, which makes us skip the extra CRI queries (e.g. cri-o 1.20 supports the JSON in the info field, but that does not contain all the data containerd reports). Make parse_containerd return true only when we successfully get the resource limit data and use its return value only to control the cgroup read. If we already have the IP address after parse_containerd, don't query CRI again. Signed-off-by: Grzegorz Nosek <[email protected]>
poiana
added
release-note
kind/bug
fntlnz
approved these changes
May 28, 2021
|
LGTM label has been added. Git tree hash: dff07279c19c8faaaa3b772112dc6ac9d1448350
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: leogr The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Closed
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.
What type of PR is this?
/kind bug
Any specific area of the project related to this PR?
/area libsinsp
What this PR does / why we need it:
We can get two things from containerd-specific data that save
us more effort later:
Unfortunately, cri-o now passes the parse_containerd checks
as well, which makes us skip the extra CRI queries (e.g. cri-o
1.20 supports the JSON in the info field, but that does not
contain all the data containerd reports).
Make parse_containerd return true only when we successfully get
the resource limit data and use its return value only to control
the cgroup read.
If we already have the IP address after parse_containerd, don't
query CRI again.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?: