|
 |
732391 |
diff -up nfs-utils-2.3.3/tools/mountstats/mountstats.py.orig nfs-utils-2.3.3/tools/mountstats/mountstats.py
|
|
|
732391 |
--- nfs-utils-2.3.3/tools/mountstats/mountstats.py.orig 2020-12-10 10:48:17.319579958 -0500
|
|
|
732391 |
+++ nfs-utils-2.3.3/tools/mountstats/mountstats.py 2020-12-10 10:52:42.481484160 -0500
|
|
|
732391 |
@@ -943,10 +943,11 @@ def print_iostat_summary(old, new, devic
|
|
|
732391 |
if not old or device not in old:
|
|
|
732391 |
stats.display_iostats(time)
|
|
|
732391 |
else:
|
|
|
732391 |
- old_stats = DeviceData()
|
|
|
732391 |
- old_stats.parse_stats(old[device])
|
|
|
732391 |
- diff_stats = stats.compare_iostats(old_stats)
|
|
|
732391 |
- diff_stats.display_iostats(time)
|
|
|
732391 |
+ if ("fstype autofs" not in str(old[device])) and ("fstype autofs" not in str(new[device])):
|
|
|
732391 |
+ old_stats = DeviceData()
|
|
|
732391 |
+ old_stats.parse_stats(old[device])
|
|
|
732391 |
+ diff_stats = stats.compare_iostats(old_stats)
|
|
|
732391 |
+ diff_stats.display_iostats(time)
|
|
|
732391 |
|
|
|
732391 |
def iostat_command(args):
|
|
|
732391 |
"""iostat-like command for NFS mount points
|
|
|
732391 |
diff -up nfs-utils-2.3.3/tools/nfs-iostat/nfs-iostat.py.orig nfs-utils-2.3.3/tools/nfs-iostat/nfs-iostat.py
|
|
|
732391 |
--- nfs-utils-2.3.3/tools/nfs-iostat/nfs-iostat.py.orig 2020-12-10 10:48:17.316579880 -0500
|
|
|
732391 |
+++ nfs-utils-2.3.3/tools/nfs-iostat/nfs-iostat.py 2020-12-10 10:52:42.481484160 -0500
|
|
|
732391 |
@@ -467,10 +467,13 @@ def parse_stats_file(filename):
|
|
|
732391 |
def print_iostat_summary(old, new, devices, time, options):
|
|
|
732391 |
stats = {}
|
|
|
732391 |
diff_stats = {}
|
|
|
732391 |
+ devicelist = []
|
|
|
732391 |
if old:
|
|
|
732391 |
# Trim device list to only include intersection of old and new data,
|
|
|
732391 |
# this addresses umounts due to autofs mountpoints
|
|
|
732391 |
- devicelist = [x for x in old if x in devices]
|
|
|
732391 |
+ for device in devices:
|
|
|
732391 |
+ if "fstype autofs" not in str(old[device]):
|
|
|
732391 |
+ devicelist.append(device)
|
|
|
732391 |
else:
|
|
|
732391 |
devicelist = devices
|
|
|
732391 |
|