[disk] be resilient when dealing with NFS secure mounts #470
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
hush-hush
requested changes
Oct 2, 2017
disk/check.py
Outdated
| self.log.debug('_exclude_disk: {}, {}, {}'.format(name, filesystem, mountpoint)) | ||
|
|
||
| # temporary hack for NFS secure mounts | ||
| mountpoint = mountpoint.split()[0] |
There was a problem hiding this comment.
What if the mountpoint contains space ?
hush-hush
reviewed
Oct 2, 2017
disk/check.py
Outdated
| # hack for NFS secure mounts | ||
| # secure mounts might look like this: '/mypath (deleted)' | ||
| # we should ignore all the bits not part of the mountpoint name | ||
| mountpoint = mountpoint.split()[-1] |
There was a problem hiding this comment.
This will return (deleted) if it's here. Shouldn't we do something like that:
mountpoint = mountpoint.rsplit(' ', 1)[0]
masci
force-pushed
the
massi/disk-nfs-secure
branch
from
f668c48 to
0fed29c
Compare
hush-hush
approved these changes
Oct 4, 2017
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?
When dealing with secure NFS mounts, in the collector log you can see:
Since the string is composed like this, in the check:
self.log.warn("Unable to get disk metrics for %s: %s", part.mountpoint, e)this means that
(deleted)is part of the mountpoint name returned by psutils and this fools any attempt to exclude a filesystem.This PR contains a hack to strip the unwanted part of the mountpoint string before evaluating the skip clauses, looking for feedback whether this is an acceptable workaround to the problem.
Versioning
manifest.jsonCHANGELOG.md