diff options
author | Kenneth D'souza <kdsouza@redhat.com> | 2020-09-08 10:07:04 -0400 |
---|---|---|
committer | Steve Dickson <steved@redhat.com> | 2020-09-08 10:07:04 -0400 |
commit | 4585114420ab5fabf530f3c812ce4741f02d8cd5 (patch) | |
tree | 260f0d1e1fb7816694d7f4629d33644c0fdbd91b | |
parent | 086e6fdce887dd68e51b7bac4a2f21cea9a4fe01 (diff) | |
download | nfs-utils-4585114420ab5fabf530f3c812ce4741f02d8cd5.tar.gz |
nfsiostat/mountstats: Drop autofs entries before calling compare_iostats()
nfsiostat/mountstats can fail with below KeyError when old stat and
new stat data go out of sync.
$ mountstats iostat 1 3
Traceback (most recent call last):
File "/usr/sbin/mountstats", line 1092, in <module>
res = main()
File "/usr/sbin/mountstats", line 1081, in main
return args.func(args)
File "/usr/sbin/mountstats", line 965, in iostat_command
print_iostat_summary(old_mountstats, mountstats, devices, sample_time)
File "/usr/sbin/mountstats", line 920, in print_iostat_summary
diff_stats = stats.compare_iostats(old_stats)
File "/usr/sbin/mountstats", line 528, in compare_iostats
if old_stats.__nfs_data['age'] > self.__nfs_data['age']:
KeyError: 'age'
Frequent mount and umount can cause autofs entries to be processed in
compare_iostats. We need to filter the devices list and drop autofs
entries to fix the issue. This way we pass only nfs mounts and
not autofs entries.
Signed-off-by: Kenneth D'souza <kdsouza@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
-rwxr-xr-x | tools/mountstats/mountstats.py | 9 | ||||
-rwxr-xr-x | tools/nfs-iostat/nfs-iostat.py | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py index 00adc96b..25e92a19 100755 --- a/tools/mountstats/mountstats.py +++ b/tools/mountstats/mountstats.py @@ -953,10 +953,11 @@ def print_iostat_summary(old, new, devices, time): if not old or device not in old: stats.display_iostats(time) else: - old_stats = DeviceData() - old_stats.parse_stats(old[device]) - diff_stats = stats.compare_iostats(old_stats) - diff_stats.display_iostats(time) + if ("fstype autofs" not in str(old[device])) and ("fstype autofs" not in str(new[device])): + old_stats = DeviceData() + old_stats.parse_stats(old[device]) + diff_stats = stats.compare_iostats(old_stats) + diff_stats.display_iostats(time) def iostat_command(args): """iostat-like command for NFS mount points diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py index 4f5e8a66..1df74ba8 100755 --- a/tools/nfs-iostat/nfs-iostat.py +++ b/tools/nfs-iostat/nfs-iostat.py @@ -470,10 +470,13 @@ def parse_stats_file(filename): def print_iostat_summary(old, new, devices, time, options): stats = {} diff_stats = {} + devicelist = [] if old: # Trim device list to only include intersection of old and new data, # this addresses umounts due to autofs mountpoints - devicelist = [x for x in old if x in devices] + for device in devices: + if "fstype autofs" not in str(old[device]): + devicelist.append(device) else: devicelist = devices |