[disk] another timeout on disk usage #2823
Merged
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
| except Exception as e: | ||
| self.log.warn("Unable to get disk metrics for %s: %s", mountpoint, e) | ||
| return metrics | ||
|
|
There was a problem hiding this comment.
I believe returning an empty dictionary would cause a KeyError exception here.
Alternatively we could catch the exception within the collect_metrics_psutil method.
There was a problem hiding this comment.
@yannmh I think you're looking at the wrong thing. These are the system.fs.inodes.* metrics. They're not referenced anywhere else.
|
I think @gmmeyer is right, this should not have any problems with an empty dictionary: https://github.com/DataDog/dd-agent/blob/greg/statvfs-fix/checks.d/disk.py#L184 |
|
Tests broke though, let's get CI back to 💯 |
|
Thanks @gmmeyer, this looks good to me. Can you please squash before merging? Thanks a lot. 👍 |
gmmeyer
force-pushed
the
greg/statvfs-fix
branch
from
07da80d to
9988b27
Compare
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 does this PR do?
In #2714, we solved a problem with disk usage where nfs mounts would hang. In some cases, we're still seeing them hanging, because
os.statvfsis being called in another place as well.This adds a timeout wrapper to that second call, as well.