-
Notifications
You must be signed in to change notification settings - Fork 814
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
[docker] bogus pid #3205
Closed
Closed
[docker] bogus pid #3205
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ | |
# project | ||
from checks import AgentCheck | ||
from config import _is_affirmative | ||
from utils.dockerutil import DockerUtil, MountException | ||
from utils.dockerutil import DockerUtil, MountException, BogusPIDException | ||
from utils.kubernetes import KubeUtil | ||
from utils.platform import Platform | ||
from utils.service_discovery.sd_backend import get_sd_backend | ||
|
@@ -575,11 +575,14 @@ def _report_performance_metrics(self, containers_by_id): | |
|
||
tags = self._get_tags(container, PERFORMANCE) | ||
|
||
self._report_cgroup_metrics(container, tags) | ||
if "_proc_root" not in container: | ||
containers_without_proc_root.append(DockerUtil.container_name_extractor(container)[0]) | ||
continue | ||
self._report_net_metrics(container, tags) | ||
try: | ||
self._report_cgroup_metrics(container, tags) | ||
if "_proc_root" not in container: | ||
containers_without_proc_root.append(DockerUtil.container_name_extractor(container)[0]) | ||
continue | ||
self._report_net_metrics(container, tags) | ||
except BogusPIDException: | ||
self.log.exception('Unable to report cgroup metrics.') | ||
|
||
if containers_without_proc_root: | ||
message = "Couldn't find pid directory for containers: {0}. They'll be missing network metrics".format( | ||
|
@@ -592,6 +595,9 @@ def _report_performance_metrics(self, containers_by_id): | |
|
||
def _report_cgroup_metrics(self, container, tags): | ||
cgroup_stat_file_failures = 0 | ||
if not container.get('_pid'): | ||
raise BogusPIDException('Cannot report on bogus pid(0)') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. does that cover There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it does |
||
|
||
for cgroup in CGROUP_METRICS: | ||
try: | ||
stat_file = self._get_cgroup_from_proc(cgroup["cgroup"], container['_pid'], cgroup['file']) | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is still going to fill the logs with tracebacks. Maybe
log.error
is enough? With the container id or name for reference.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good, I'll update that.